Merge branch 'v3' into v3-environments
This commit is contained in:
Sipke Schoorstra
commit
9f9f35edb4
2
.github/workflows/npm-packages.yml
vendored
2
.github/workflows/npm-packages.yml
vendored
|
|
@ -52,7 +52,7 @@ jobs:
|
|||
run: |
|
||||
npm install --force
|
||||
npm version $VERSION --allow-same-version
|
||||
npx lerna run build
|
||||
npx lerna run build-library
|
||||
- name: Pack Designer
|
||||
working-directory: ./src/designer/designer_packages/elsa-workflows-designer
|
||||
run: npm pack
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ export class ElsaDropdownButton {
|
|||
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
|
||||
c.detach();
|
||||
this.el = r.nativeElement;
|
||||
proxyOutputs(this, this.el, ['itemSelected']);
|
||||
proxyOutputs(this, this.el, ['itemSelected', 'menuOpened']);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -356,6 +356,8 @@ import type { DropdownButtonItem as IElsaDropdownButtonDropdownButtonItem } from
|
|||
export declare interface ElsaDropdownButton extends Components.ElsaDropdownButton {
|
||||
|
||||
itemSelected: EventEmitter<CustomEvent<IElsaDropdownButtonDropdownButtonItem>>;
|
||||
|
||||
menuOpened: EventEmitter<CustomEvent<void>>;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@
|
|||
"dependencies": {
|
||||
"@antv/layout": "^0.3.11",
|
||||
"@antv/x6": "1.34.6",
|
||||
"@ctrl/tinycolor": "^3.5.0",
|
||||
"@stencil/core": "^2.20.0",
|
||||
"@ctrl/tinycolor": "^3.6.0",
|
||||
"@stencil/core": "^3.2.2",
|
||||
"@stencil/state-tunnel": "^1.0.1",
|
||||
"@stencil/store": "^2.0.1",
|
||||
"@stencil/store": "^2.0.6",
|
||||
"async-mutex": "^0.4.0",
|
||||
"axios": "^0.27.2",
|
||||
"axios": "^1.4.0",
|
||||
"axios-middleware": "^0.3.1",
|
||||
"el-transition": "^0.0.7",
|
||||
"js-cookie": "^3.0.1",
|
||||
"js-cookie": "^3.0.5",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"lodash": "^4.17.21",
|
||||
"moment": "^2.29.4",
|
||||
|
|
@ -49,19 +49,19 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@fullhuman/postcss-purgecss": "^5.0.0",
|
||||
"@stencil/angular-output-target": "^0.5.0",
|
||||
"@stencil/angular-output-target": "^0.6.0",
|
||||
"@stencil/postcss": "^2.1.0",
|
||||
"@stencil/react-output-target": "^0.5.0",
|
||||
"@stencil/sass": "^2.0.1",
|
||||
"@stencil/sass": "^3.0.2",
|
||||
"@tailwindcss/aspect-ratio": "^0.4.2",
|
||||
"@tailwindcss/forms": "^0.5.3",
|
||||
"@tailwindcss/typography": "^0.5.8",
|
||||
"@types/jquery": "^3.5.14",
|
||||
"@tailwindcss/typography": "^0.5.9",
|
||||
"@types/jquery": "^3.5.16",
|
||||
"@types/jquery-mousewheel": "^3.1.9",
|
||||
"@types/js-cookie": "^3.0.2",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"postcss": "^8.4.19",
|
||||
"tailwindcss": "^3.2.4"
|
||||
"@types/js-cookie": "^3.0.3",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"postcss": "^8.4.23",
|
||||
"tailwindcss": "^3.3.2"
|
||||
},
|
||||
"license": "MIT"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,32 @@ import { RenderActivityPropsContext } from "./modules/workflow-definitions/compo
|
|||
import { ActivityDriverRegistry } from "./services";
|
||||
import { JournalItemSelectedArgs } from "./modules/workflow-instances/events";
|
||||
import { PublishClickedArgs } from "./modules/workflow-definitions/components/publish-button";
|
||||
export { InputDefinition, OutputDefinition, WorkflowDefinition, WorkflowDefinitionSummary } from "./modules/workflow-definitions/models/entities";
|
||||
export { Activity, ActivityDeletedArgs, ActivitySelectedArgs, ChildActivitySelectedArgs, ContainerSelectedArgs, EditChildActivityArgs, GraphUpdatedArgs, IntellisenseContext, SelectList, SelectListItem, TabChangedArgs, TabDefinition, Variable, WorkflowExecutionLogRecord, WorkflowInstance, WorkflowInstanceSummary, WorkflowUpdatedArgs } from "./models";
|
||||
export { ActivityUpdatedArgs, DeleteActivityRequestedArgs, Widget, WorkflowDefinitionPropsUpdatedArgs, WorkflowDefinitionUpdatedArgs } from "./modules/workflow-definitions/models/ui";
|
||||
export { Button } from "./components/shared/button-group/models";
|
||||
export { ActivityInputContext } from "./services/activity-input-driver";
|
||||
export { ContextMenuAnchorPoint, ContextMenuItem } from "./components/shared/context-menu/models";
|
||||
export { DropdownButtonItem, DropdownButtonOrigin } from "./components/shared/dropdown-button/models";
|
||||
export { Graph } from "@antv/x6";
|
||||
export { AddActivityArgs, FlowchartPathItem, LayoutDirection, RenameActivityArgs, UpdateActivityArgs } from "./modules/flowchart/models";
|
||||
export { OutNode } from "@antv/layout";
|
||||
export { ActivityNodeShape } from "./modules/flowchart/shapes";
|
||||
export { PanelActionClickArgs, PanelActionDefinition } from "./components/shared/form-panel/models";
|
||||
export { ExpressionChangedArs } from "./components/shared/input-control-switch/input-control-switch";
|
||||
export { SignedInArgs } from "./modules/login/models";
|
||||
export { ModalActionClickArgs, ModalActionDefinition, ModalDialogInstance } from "./components/shared/modal-dialog/models";
|
||||
export { ModalType } from "./components/shared/modal-dialog/modal-type";
|
||||
export { MonacoValueChangedArgs } from "./components/shared/monaco-editor/monaco-editor";
|
||||
export { NotificationType } from "./modules/notifications/models";
|
||||
export { PagerData } from "./components/shared/pager/pager";
|
||||
export { PanelPosition, PanelStateChangedArgs } from "./components/panel/models";
|
||||
export { ShellInitializingContext } from "./models/shell";
|
||||
export { WorkflowContextProviderDescriptor } from "./modules/workflow-contexts/services/api";
|
||||
export { RenderActivityPropsContext } from "./modules/workflow-definitions/components/models";
|
||||
export { ActivityDriverRegistry } from "./services";
|
||||
export { JournalItemSelectedArgs } from "./modules/workflow-instances/events";
|
||||
export { PublishClickedArgs } from "./modules/workflow-definitions/components/publish-button";
|
||||
export namespace Components {
|
||||
interface ElsaActivityInputEditorDialogContent {
|
||||
"getInput": () => Promise<InputDefinition>;
|
||||
|
|
|
|||
775
src/designer/package-lock.json
generated
775
src/designer/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -6,7 +6,7 @@
|
|||
"build:debug": "cross-env webpack --mode=development --env configuration=Debug"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.126",
|
||||
"@elsa-workflows/elsa-workflows-designer": "3.0.3-preview.128",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"monaco-editor": "^0.36.1",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ using Elsa.EntityFrameworkCore.Extensions;
|
|||
using Elsa.EntityFrameworkCore.Modules.Management;
|
||||
using Elsa.EntityFrameworkCore.Modules.Runtime;
|
||||
using Elsa.Extensions;
|
||||
using Elsa.Samples.WorkflowServer.Activities;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ public class AskAge : Composite<int>
|
|||
|
||||
public AskAge()
|
||||
{
|
||||
Variables = new List<Variable> { _age };
|
||||
Root = new Sequence
|
||||
{
|
||||
Variables = { _age },
|
||||
Activities =
|
||||
{
|
||||
new WriteLine(context => Prompt.Get(context)),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Elsa.Extensions;
|
||||
using Elsa.Workflows.Core.Activities;
|
||||
using Elsa.Workflows.Core.Models;
|
||||
using Elsa.Workflows.Management.Activities.SetOutput;
|
||||
|
||||
public class AskDetails : Composite<Person>
|
||||
{
|
||||
|
|
@ -12,9 +13,9 @@ public class AskDetails : Composite<Person>
|
|||
|
||||
public AskDetails()
|
||||
{
|
||||
Variables = new List<Variable> { _name, _age };
|
||||
Root = new Sequence
|
||||
{
|
||||
Variables = { _name, _age },
|
||||
Activities =
|
||||
{
|
||||
new AskName
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ public class AskName : Composite<string>
|
|||
|
||||
public AskName()
|
||||
{
|
||||
Variables = new List<Variable> { _name };
|
||||
Root = new Sequence
|
||||
{
|
||||
Variables = new List<Variable> { _name },
|
||||
Activities = new List<IActivity>
|
||||
{
|
||||
new WriteLine(context => Prompt.Get(context)),
|
||||
|
|
|
|||
Loading…
Reference in a new issue