Merge branch 'v3' into v3-connection-model-refactoring

This commit is contained in:
Sipke Schoorstra 2023-06-16 23:49:11 +02:00
commit de688a9eff
6 changed files with 15 additions and 5 deletions

View file

@ -81,6 +81,7 @@ export class Panel {
toggleClassMap[PanelPosition.Bottom] = 'elsa-panel-toggle-bottom';
const toggleCssClass = toggleClassMap[position];
const iconOrientationCssClass = isExpanded ? 'tw-rotate-180': '';
const dragBarClassMap = {
[PanelPosition.Left]: 'tw-right-0 tw-h-full tw-cursor-col-resize tw-w-1',
@ -99,7 +100,7 @@ export class Panel {
<div class={`tw-text-white ${toggleCssClass}`} onClick={() => this.onToggleClick()}>
<svg
class="tw-h-6 tw-w-6 tw-text-gray-700"
class={`tw-h-6 tw-w-6 tw-text-gray-700 ${iconOrientationCssClass}`}
width="24"
height="24"
viewBox="0 0 24 24"

View file

@ -5,7 +5,6 @@
cursor: default;
}
width: calc(100vw - var(--workflow-editor-width) - var(--activity-picker-width)) !important;
height: calc(100vh - var(--activity-editor-height) - 54px - 64px) !important;
}
.x6-widget-selection-box {

View file

@ -3,6 +3,11 @@
--activity-picker-width: 300px;
--activity-editor-height: 200px;
}
.x6-graph-scroller {
height: calc(100vh - var(--activity-editor-height) - 64px) !important;
}
elsa-flowchart {
position: absolute;
left: var(--activity-picker-width);

View file

@ -3,6 +3,11 @@
--activity-picker-width: 300px;
--activity-editor-height: 200px;
}
.x6-graph-scroller {
height: calc(100vh - var(--activity-editor-height) - 64px) !important;
}
elsa-flowchart {
position: absolute;
left: var(--activity-picker-width);

View file

@ -143,7 +143,7 @@ export class WorkflowInstanceViewer {
}
else if(activity.root == null && activity.body.type == "Elsa.Flowchart"){
return activity.body as Flowchart;
}
}
else {
return this.findFlowchartOfActivityRecursive((activity as Workflow).root);
}
@ -261,7 +261,7 @@ export class WorkflowInstanceViewer {
<elsa-panel
class="elsa-activity-editor-container"
position={PanelPosition.Bottom}
onExpandedStateChanged={e => this.onActivityEditorPanelStateChanged(e.detail)}>
>
<div class="activity-editor-container">
{this.renderSelectedObject()}
</div>

View file

@ -6,7 +6,7 @@
"build:debug": "cross-env webpack --mode=development --env configuration=Debug"
},
"devDependencies": {
"@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.172",
"@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.173",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"monaco-editor": "^0.36.1",