@bizdoc/core 1.13.0-next.13 → 1.13.0-next.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/compose/trace/flow.component.mjs +19 -23
- package/esm2020/lib/compose/trace/trace.component.mjs +2 -2
- package/fesm2015/bizdoc-core.mjs +19 -23
- package/fesm2015/bizdoc-core.mjs.map +1 -1
- package/fesm2020/bizdoc-core.mjs +19 -23
- package/fesm2020/bizdoc-core.mjs.map +1 -1
- package/package.json +1 -1
package/fesm2020/bizdoc-core.mjs
CHANGED
@@ -13554,9 +13554,7 @@ class FlowViewComponent extends TraceBase {
|
|
13554
13554
|
offset: shape.type === 'Path' ? {
|
13555
13555
|
y: 1
|
13556
13556
|
} : { x: .5 },
|
13557
|
-
style: {
|
13558
|
-
//bold: true
|
13559
|
-
},
|
13557
|
+
style: {},
|
13560
13558
|
verticalAlignment: shape.type === 'Path' ? 'Top' : 'Center'
|
13561
13559
|
}]
|
13562
13560
|
});
|
@@ -13712,17 +13710,21 @@ class FlowViewComponent extends TraceBase {
|
|
13712
13710
|
}
|
13713
13711
|
if (recipient.replied) {
|
13714
13712
|
const time = this._fromNow(recipient.replied);
|
13713
|
+
const targets = this.model.recipients.filter(r => r.originId === recipient.id), to = [];
|
13714
|
+
if (targets.length)
|
13715
|
+
for (let sibling of targets) {
|
13716
|
+
const who = await this._accounts.get(sibling.userId).toPromise();
|
13717
|
+
to.push(who.name);
|
13718
|
+
}
|
13715
13719
|
if (recipient.byId) {
|
13716
13720
|
if (recipient.byId === this._session.profile.byId) {
|
13717
13721
|
const action = this._action(recipient.action, this._session.profile.byGender);
|
13718
|
-
if (
|
13719
|
-
const origin = this.model.recipients.find(r => r.id === recipient.originId);
|
13720
|
-
const to = await this._accounts.get(origin.userId).toPromise();
|
13722
|
+
if (to.length) {
|
13721
13723
|
if (recipient.userId === this._session.profile.userId)
|
13722
|
-
tooltip.note = this._translate.get('ActionTakenByYouTo', action, to
|
13724
|
+
tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), this._session.profile.name, time);
|
13723
13725
|
else {
|
13724
13726
|
const who = await this._accounts.get(recipient.userId).toPromise();
|
13725
|
-
tooltip.note = this._translate.get('ActionTakenByYouTo', action, to
|
13727
|
+
tooltip.note = this._translate.get('ActionTakenByYouTo', action, this._translate.join(to), who.name, time);
|
13726
13728
|
}
|
13727
13729
|
}
|
13728
13730
|
else if (recipient.userId === this._session.profile.userId)
|
@@ -13736,40 +13738,34 @@ class FlowViewComponent extends TraceBase {
|
|
13736
13738
|
const by = await this._accounts.get(recipient.byId).toPromise();
|
13737
13739
|
const action = this._action(recipient.action, by.gender);
|
13738
13740
|
if (recipient.userId === this._session.profile.userId) {
|
13739
|
-
if (
|
13740
|
-
|
13741
|
-
const to = await this._accounts.get(origin.userId).toPromise();
|
13742
|
-
tooltip.note = this._translate.get('YouTakenActionByTo', by.name, action, to.name, time);
|
13741
|
+
if (to.length) {
|
13742
|
+
tooltip.note = this._translate.get('YouTakenActionByTo', by.name, action, this._translate.join(to), time);
|
13743
13743
|
}
|
13744
13744
|
else
|
13745
13745
|
tooltip.note = this._translate.get('YouTakenActionBy', by.name, action, time);
|
13746
13746
|
}
|
13747
13747
|
else {
|
13748
13748
|
const who = await this._accounts.get(recipient.userId).toPromise();
|
13749
|
-
if (
|
13750
|
-
|
13751
|
-
const to = await this._accounts.get(origin.userId).toPromise();
|
13752
|
-
tooltip.note = this._translate.get('ActionTakenByTo', by.name, action, to.name, who.name, time);
|
13749
|
+
if (to.length) {
|
13750
|
+
tooltip.note = this._translate.get('ActionTakenByTo', by.name, action, this._translate.join(to), who.name, time);
|
13753
13751
|
}
|
13754
13752
|
else
|
13755
13753
|
tooltip.note = this._translate.get('ActionTakenBy', by.name, action, who.name, time);
|
13756
13754
|
}
|
13757
13755
|
}
|
13758
13756
|
}
|
13759
|
-
else if (
|
13760
|
-
const origin = this.model.recipients.find(r => r.id === recipient.originId);
|
13761
|
-
const to = await this._accounts.get(origin.userId).toPromise();
|
13757
|
+
else if (to.length) {
|
13762
13758
|
if (recipient.userId === this._session.profile.userId) {
|
13763
13759
|
const action = this._action(recipient.action, this._session.profile.gender);
|
13764
13760
|
if (this._session.isImpersonating)
|
13765
|
-
tooltip.note = this._translate.get('ActionTakenTo', this._session.profile.name, action, to
|
13761
|
+
tooltip.note = this._translate.get('ActionTakenTo', this._session.profile.name, action, this._translate.join(to), time);
|
13766
13762
|
else
|
13767
|
-
tooltip.note = this._translate.get('YouTakenActionTo', action, to
|
13763
|
+
tooltip.note = this._translate.get('YouTakenActionTo', action, this._translate.join(to), time);
|
13768
13764
|
}
|
13769
13765
|
else {
|
13770
13766
|
const who = await this._accounts.get(recipient.userId).toPromise();
|
13771
13767
|
const action = this._action(recipient.action, who.gender);
|
13772
|
-
tooltip.note = this._translate.get('ActionTakenTo', who.name, action, to
|
13768
|
+
tooltip.note = this._translate.get('ActionTakenTo', who.name, action, this._translate.join(to));
|
13773
13769
|
}
|
13774
13770
|
}
|
13775
13771
|
else if (this._session.isImpersonating) {
|
@@ -14079,7 +14075,7 @@ class TraceViewComponent extends TraceBase {
|
|
14079
14075
|
}
|
14080
14076
|
}
|
14081
14077
|
for (let recipient of recipients) {
|
14082
|
-
if (!recipient.pending && !recipient.estimate)
|
14078
|
+
if (!recipient.pending && !recipient.estimate && !recipient.fyi)
|
14083
14079
|
continue;
|
14084
14080
|
let step = {
|
14085
14081
|
time: recipient.received,
|