getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2025-10-06 13:40:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
RB 2024-03-05 16:34:12 +08:00
parent 184f653fce
commit ed2cb1083a
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/rebuild/core/service/trigger/impl/AggregationEvaluator.java
View file

@ -218,7 +218,7 @@ public class AggregationEvaluator {
Map<Object, Integer> countList = null; Map<Object, Integer> countList = null;
if (mode == 2 || mode == 3) { if (mode == 2 || mode == 3) {
nvList = new LinkedHashSet<>(); nvList = new LinkedHashSet<>();
if (mode == 3) countList = new HashMap<>(); // 针对文本 if (mode == 3) countList = new HashMap<>(); // 仅文本有效 *N
} else { } else {
nvList = new ArrayList<>(); nvList = new ArrayList<>();
} }

2
src/main/resources/web/assets/css/rb-page.css
View file

@ -79,9 +79,11 @@ code {
.dropdown-menu { .dropdown-menu {
box-shadow: 0 3px 0.3077rem rgba(0, 0, 0, 0.1); box-shadow: 0 3px 0.3077rem rgba(0, 0, 0, 0.1);
box-shadow: 0px 8px 10px 1px rgba(0,0,0,.14), 0px 3px 14px 2px rgba(0,0,0,.12), 0px 5px 5px -3px rgba(0,0,0,.2);
border-width: 0; border-width: 0;
border-radius: 0; border-radius: 0;
max-width: 300px; max-width: 300px;
user-select: none;
} }
.dropdown-menu .dropdown-item, .dropdown-menu .dropdown-item,

4
src/main/resources/web/assets/js/trigger/trigger.FIELDAGGREGATION.js
View file

@ -10,7 +10,7 @@ const CALC_MODES2 = {
...FormulaAggregation.CALC_MODES, ...FormulaAggregation.CALC_MODES,
RBJOIN: $L('连接'), RBJOIN: $L('连接'),
RBJOIN2: $L('去重连接'), RBJOIN2: $L('去重连接'),
// RBJOIN3: $L('去重连接*N'), RBJOIN3: $L('去重连接*N'),
} }
const __LAB_MATCHFIELDS = false const __LAB_MATCHFIELDS = false
@ -288,7 +288,7 @@ class ContentFieldAggregation extends ActionContentSpec {
if ('RBJOIN' === cm || 'RBJOIN2' === cm || 'RBJOIN3' === cm) { if ('RBJOIN' === cm || 'RBJOIN2' === cm || 'RBJOIN3' === cm) {
tfAllow = this.__targetFieldsCache.filter((x) => { tfAllow = this.__targetFieldsCache.filter((x) => {
if ('NTEXT' === x.type) return true if ('NTEXT' === x.type) return true
if ('N2NREFERENCE' === x.type) return x.ref[0] === sf.ref[0] if ('N2NREFERENCE' === x.type) return sf.ref && sf.ref[0] === x.ref[0]
if ('FILE' === x.type) return true if ('FILE' === x.type) return true
return false return false
}) })

4
src/main/resources/web/assets/js/trigger/trigger.GROUPAGGREGATION.js
View file

@ -10,7 +10,7 @@ const CALC_MODES2 = {
...FormulaAggregation.CALC_MODES, ...FormulaAggregation.CALC_MODES,
RBJOIN: $L('连接'), RBJOIN: $L('连接'),
RBJOIN2: $L('去重连接'), RBJOIN2: $L('去重连接'),
// RBJOIN3: $L('去重连接*N'), RBJOIN3: $L('去重连接*N'),
} }
// ~~ 分组聚合 // ~~ 分组聚合
@ -380,7 +380,7 @@ class ContentGroupAggregation extends ActionContentSpec {
if ('RBJOIN' === cm || 'RBJOIN2' === cm || 'RBJOIN3' === cm) { if ('RBJOIN' === cm || 'RBJOIN2' === cm || 'RBJOIN3' === cm) {
tfAllow = this.__targetFieldsCache.filter((x) => { tfAllow = this.__targetFieldsCache.filter((x) => {
if ('NTEXT' === x.type) return true if ('NTEXT' === x.type) return true
if ('N2NREFERENCE' === x.type) return x.ref[0] === sf.ref[0] if ('N2NREFERENCE' === x.type) return sf.ref && sf.ref[0] === x.ref[0]
if ('FILE' === x.type) return true if ('FILE' === x.type) return true
return false return false
}) })