Skip to content

Commit 2cca6b6

Browse files
committed
update: pass swf index to unit inside
1 parent 8521194 commit 2cca6b6

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

dist/js/subworkflows/create.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ function createSubworkflow({
228228
dynamicSubworkflow = null
229229
} = subworkflowData;
230230
unitConfigs.forEach(_config => {
231+
if (config.index !== undefined) _config.config = {
232+
...(_config.config || {}),
233+
subworkflowIndex: config.index
234+
};
231235
units.push(createUnit({
232236
config: _config,
233237
application,

dist/js/units/base.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
1616
// eslint-disable-next-line max-len
1717
class BaseUnit extends _entity.NamedDefaultableRepetitionRuntimeItemsImportantSettingsContextAndRenderHashedInMemoryEntity {
1818
constructor(config) {
19-
const flowchartId = config.flowchartId || BaseUnit.generateFlowChartId.call(new.target, config.name);
19+
const nameWithIndex = config.name + (config.subworkflowIndex || "");
20+
const flowchartId = config.flowchartId || BaseUnit.generateFlowChartId.call(new.target, nameWithIndex);
2021
super({
2122
...config,
2223
status: config.status || _enums.UNIT_STATUSES.idle,

src/js/subworkflows/create.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,11 @@ function createSubworkflow({
164164

165165
let units = [];
166166
const { name, units: unitConfigs, config = {}, dynamicSubworkflow = null } = subworkflowData;
167+
167168
unitConfigs.forEach((_config) => {
168-
units.push(
169-
createUnit({
170-
config: _config,
171-
application,
172-
unitBuilders,
173-
unitFactoryCls,
174-
}),
175-
);
169+
if (config.index !== undefined)
170+
_config.config = { ...(_config.config || {}), subworkflowIndex: config.index };
171+
units.push(createUnit({ config: _config, application, unitBuilders, unitFactoryCls }));
176172
});
177173
if (dynamicSubworkflow) {
178174
units = createDynamicUnits({

src/js/units/base.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ export class BaseUnit extends NamedDefaultableRepetitionRuntimeItemsImportantSet
1010
static usePredefinedIds = false;
1111

1212
constructor(config) {
13+
const nameWithIndex = config.name + (config.subworkflowIndex || "");
1314
const flowchartId =
14-
config.flowchartId || BaseUnit.generateFlowChartId.call(new.target, config.name);
15+
config.flowchartId || BaseUnit.generateFlowChartId.call(new.target, nameWithIndex);
1516
super({
1617
...config,
1718
status: config.status || UNIT_STATUSES.idle,

0 commit comments

Comments
 (0)