parent
5c25f23082
commit
b2970245d9
@ -0,0 +1,8 @@
|
||||
import { createStyles } from 'antd-style';
|
||||
|
||||
export const useStyles = createStyles(({ css, token }) => {
|
||||
return css`
|
||||
padding-top: ${token.paddingContentVerticalLG}px;
|
||||
background-color: var(--colorBgDrawer);
|
||||
`;
|
||||
});
|
@ -0,0 +1,86 @@
|
||||
import React, { useContext, useEffect, useRef, useState } from 'react';
|
||||
import { observer, RecursionField, useField, useFieldSchema } from '@tachybase/schema';
|
||||
|
||||
import { createPortal } from 'react-dom';
|
||||
|
||||
import { useStyles } from './Action.Area.style';
|
||||
import { useActionContext } from './hooks';
|
||||
import { ComposedActionDrawer } from './types';
|
||||
|
||||
const ActionAreaContext = React.createContext<any>({});
|
||||
|
||||
export const ActionAreaProvider = ({ children }: { children: React.ReactNode }) => {
|
||||
const [component, setComponent] = useState(() => {});
|
||||
const [prevSetVisible, setPrevSetVisible] = useState(() => {});
|
||||
const ref = useRef();
|
||||
return (
|
||||
<ActionAreaContext.Provider value={{ component, setComponent, prevSetVisible, setPrevSetVisible, ref }}>
|
||||
{children}
|
||||
</ActionAreaContext.Provider>
|
||||
);
|
||||
};
|
||||
|
||||
export const useActionAreaStub = () => {
|
||||
const { component } = useContext(ActionAreaContext);
|
||||
return component;
|
||||
};
|
||||
|
||||
export const ActionAreaStub = () => {
|
||||
const { ref } = useContext(ActionAreaContext);
|
||||
return <div ref={ref}></div>;
|
||||
};
|
||||
|
||||
export const ActionAreaPlayer = ({ children }) => {
|
||||
const { visible, setVisible } = useActionContext();
|
||||
const { prevSetVisible, setPrevSetVisible, ref } = useContext(ActionAreaContext);
|
||||
useEffect(() => {
|
||||
if (visible) {
|
||||
setPrevSetVisible(() => {
|
||||
prevSetVisible?.(false);
|
||||
return setVisible;
|
||||
});
|
||||
}
|
||||
}, [visible]);
|
||||
|
||||
return visible ? createPortal(children, ref.current) : null;
|
||||
};
|
||||
|
||||
export const ActionArea: ComposedActionDrawer = observer(
|
||||
(props) => {
|
||||
const { footerNodeName = 'Action.Drawer.Footer' } = props;
|
||||
const schema = useFieldSchema();
|
||||
const field = useField();
|
||||
const { styles } = useStyles();
|
||||
|
||||
const Current = () => (
|
||||
<div className={styles}>
|
||||
<RecursionField
|
||||
basePath={field.address}
|
||||
schema={schema}
|
||||
onlyRenderProperties
|
||||
filterProperties={(s) => {
|
||||
return s['x-component'] !== footerNodeName;
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<ActionAreaPlayer>
|
||||
<Current />
|
||||
</ActionAreaPlayer>
|
||||
);
|
||||
},
|
||||
{ displayName: 'ActionArea' },
|
||||
);
|
||||
|
||||
ActionArea.Footer = observer(
|
||||
() => {
|
||||
const field = useField();
|
||||
const schema = useFieldSchema();
|
||||
return <RecursionField basePath={field.address} schema={schema} onlyRenderProperties />;
|
||||
},
|
||||
{ displayName: 'ActionArea.Footer' },
|
||||
);
|
||||
|
||||
export default ActionArea;
|
@ -17,6 +17,7 @@ import { useLocalVariables, useVariables } from '../../../variables';
|
||||
import { SortableItem } from '../../common';
|
||||
import { useCompile, useComponent, useDesigner } from '../../hooks';
|
||||
import { useProps } from '../../hooks/useProps';
|
||||
import { ActionArea } from './Action.Area';
|
||||
import ActionContainer from './Action.Container';
|
||||
import { ActionDesigner } from './Action.Designer';
|
||||
import { ActionDrawer } from './Action.Drawer';
|
||||
@ -231,5 +232,6 @@ Action.Drawer = ActionDrawer;
|
||||
Action.Modal = ActionModal;
|
||||
Action.Container = ActionContainer;
|
||||
Action.Page = ActionPage;
|
||||
Action.Area = ActionArea;
|
||||
|
||||
export default Action;
|
||||
|
@ -7,3 +7,4 @@ export * from './hooks/useGetAriaLabelOfDrawer';
|
||||
export * from './hooks/useGetAriaLabelOfModal';
|
||||
export * from './hooks/useGetAriaLabelOfPopover';
|
||||
export * from './Action.Designer';
|
||||
export * from './Action.Area';
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { Alert, Slider } from 'antd';
|
||||
import React from 'react';
|
||||
import { css, cx } from '@tachybase/client';
|
||||
|
||||
import { cx, css } from '@tachybase/client';
|
||||
import { Alert, Slider } from 'antd';
|
||||
|
||||
import { Branch } from './Branch';
|
||||
import { useFlowContext } from './FlowContext';
|
||||
|
@ -1,28 +1,31 @@
|
||||
import { DownOutlined, EllipsisOutlined, RightOutlined } from '@ant-design/icons';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
ActionAreaProvider,
|
||||
ActionAreaStub,
|
||||
ActionContextProvider,
|
||||
cx,
|
||||
ResourceActionProvider,
|
||||
SchemaComponent,
|
||||
cx,
|
||||
useApp,
|
||||
useDocumentTitle,
|
||||
useResourceActionContext,
|
||||
useResourceContext,
|
||||
} from '@tachybase/client';
|
||||
import { str2moment } from '@tachybase/utils/client';
|
||||
import { App, Breadcrumb, Button, Dropdown, Result, Spin, Switch, message } from 'antd';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
|
||||
import { DownOutlined, EllipsisOutlined, RightOutlined } from '@ant-design/icons';
|
||||
import { App, Breadcrumb, Button, Dropdown, message, Result, Spin, Switch } from 'antd';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link, useNavigate } from 'react-router-dom';
|
||||
|
||||
import { CanvasContent } from './CanvasContent';
|
||||
import { ExecutionStatusColumn } from './components/ExecutionStatus';
|
||||
import { ExecutionLink } from './ExecutionLink';
|
||||
import { FlowContext, useFlowContext } from './FlowContext';
|
||||
import { lang } from './locale';
|
||||
import { executionSchema } from './schemas/executions';
|
||||
import useStyles from './style';
|
||||
import { linkNodes, getWorkflowDetailPath } from './utils';
|
||||
import { ExecutionStatusColumn } from './components/ExecutionStatus';
|
||||
import { getWorkflowDetailPath, linkNodes } from './utils';
|
||||
|
||||
function ExecutionResourceProvider({ request, filter = {}, ...others }) {
|
||||
const { workflow } = useFlowContext();
|
||||
@ -236,7 +239,14 @@ export function WorkflowCanvas() {
|
||||
</ActionContextProvider>
|
||||
</aside>
|
||||
</div>
|
||||
<ActionAreaProvider>
|
||||
<div className="workflow-content">
|
||||
<CanvasContent entry={entry} />
|
||||
<div className="workflow-operator-area">
|
||||
<ActionAreaStub />
|
||||
</div>
|
||||
</div>
|
||||
</ActionAreaProvider>
|
||||
</FlowContext.Provider>
|
||||
);
|
||||
}
|
||||
|
@ -1,15 +1,16 @@
|
||||
import { SchemaComponent, SchemaComponentContext, usePlugin, useRecord } from '@tachybase/client';
|
||||
import { Card } from 'antd';
|
||||
import React, { useContext, useEffect } from 'react';
|
||||
import { SchemaComponent, SchemaComponentContext, usePlugin, useRecord } from '@tachybase/client';
|
||||
import { onFieldChange, useField, useFormEffects } from '@tachybase/schema';
|
||||
|
||||
import { Card } from 'antd';
|
||||
|
||||
import WorkflowPlugin, { RadioWithTooltip } from '.';
|
||||
import { ExecutionStatusColumn, ExecutionStatusSelect } from './components/ExecutionStatus';
|
||||
import OpenDrawer from './components/OpenDrawer';
|
||||
import { ExecutionLink } from './ExecutionLink';
|
||||
import { ExecutionResourceProvider } from './ExecutionResourceProvider';
|
||||
import { WorkflowLink } from './WorkflowLink';
|
||||
import OpenDrawer from './components/OpenDrawer';
|
||||
import { workflowSchema } from './schemas/workflows';
|
||||
import { ExecutionStatusSelect, ExecutionStatusColumn } from './components/ExecutionStatus';
|
||||
import WorkflowPlugin, { RadioWithTooltip } from '.';
|
||||
import { onFieldChange } from '@tachybase/schema';
|
||||
import { useField, useFormEffects } from '@tachybase/schema';
|
||||
import { WorkflowLink } from './WorkflowLink';
|
||||
|
||||
function SyncOptionSelect(props) {
|
||||
const field = useField<any>();
|
||||
|
@ -1,7 +1,8 @@
|
||||
import { QuestionCircleOutlined } from '@ant-design/icons';
|
||||
import { css, useCompile } from '@tachybase/client';
|
||||
import { Radio, Space, Tooltip } from 'antd';
|
||||
import React from 'react';
|
||||
import { css, useCompile } from '@tachybase/client';
|
||||
|
||||
import { QuestionCircleOutlined } from '@ant-design/icons';
|
||||
import { Radio, Space, Tooltip } from 'antd';
|
||||
|
||||
export interface RadioWithTooltipOption {
|
||||
value: any;
|
||||
|
@ -1,12 +1,12 @@
|
||||
import { SchemaInitializerItemType } from '@tachybase/client';
|
||||
import { Evaluator, evaluators, getOptions } from '@tachybase/evaluators/client';
|
||||
|
||||
import { RadioWithTooltip } from '../components/RadioWithTooltip';
|
||||
import { ValueBlock } from '../components/ValueBlock';
|
||||
import { renderEngineReference } from '../components/renderEngineReference';
|
||||
import { NAMESPACE, lang } from '../locale';
|
||||
import { BaseTypeSets, WorkflowVariableTextArea, defaultFieldNames } from '../variable';
|
||||
import { Instruction } from '.';
|
||||
import { RadioWithTooltip } from '../components/RadioWithTooltip';
|
||||
import { renderEngineReference } from '../components/renderEngineReference';
|
||||
import { ValueBlock } from '../components/ValueBlock';
|
||||
import { lang, NAMESPACE } from '../locale';
|
||||
import { BaseTypeSets, defaultFieldNames, WorkflowVariableTextArea } from '../variable';
|
||||
|
||||
export default class extends Instruction {
|
||||
title = `{{t("Calculation", { ns: "${NAMESPACE}" })}}`;
|
||||
|
@ -1,10 +1,12 @@
|
||||
import { CloseCircleOutlined } from '@ant-design/icons';
|
||||
import React from 'react';
|
||||
import { css, cx, useCompile, Variable } from '@tachybase/client';
|
||||
import { evaluators } from '@tachybase/evaluators/client';
|
||||
import { Registry } from '@tachybase/utils/client';
|
||||
|
||||
import { CloseCircleOutlined } from '@ant-design/icons';
|
||||
import { Button, Select } from 'antd';
|
||||
import React from 'react';
|
||||
import { Trans, useTranslation } from 'react-i18next';
|
||||
|
||||
import { Instruction, NodeDefaultView } from '.';
|
||||
import { Branch } from '../Branch';
|
||||
import { RadioWithTooltip, RadioWithTooltipOption } from '../components/RadioWithTooltip';
|
||||
|
@ -327,43 +327,7 @@ export function NodeDefaultView(props) {
|
||||
}
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className={cx(styles.nodeClass, `workflow-node-type-${data.type}`)}>
|
||||
<div
|
||||
role="button"
|
||||
aria-label={`${typeTitle}-${editingTitle}`}
|
||||
className={cx(styles.nodeCardClass, { configuring: editingConfig })}
|
||||
onClick={onOpenDrawer}
|
||||
>
|
||||
<div className={cx(styles.nodeMetaClass, 'workflow-node-meta')}>
|
||||
<Tag>{typeTitle}</Tag>
|
||||
<span className="workflow-node-id">{data.id}</span>
|
||||
</div>
|
||||
<Input.TextArea
|
||||
disabled={workflow.executed}
|
||||
value={editingTitle}
|
||||
onChange={(ev) => setEditingTitle(ev.target.value)}
|
||||
onBlur={(ev) => onChangeTitle(ev.target.value)}
|
||||
autoSize
|
||||
/>
|
||||
<RemoveButton />
|
||||
<JobButton />
|
||||
<ActionContextProvider
|
||||
value={{
|
||||
visible: editingConfig,
|
||||
setVisible: resetForm,
|
||||
formValueChanged,
|
||||
setFormValueChanged,
|
||||
}}
|
||||
>
|
||||
<FormProvider form={form}>
|
||||
<SchemaComponent
|
||||
scope={{
|
||||
...instruction.scope,
|
||||
useFormProviderProps,
|
||||
}}
|
||||
components={instruction.components}
|
||||
schema={{
|
||||
const schema = {
|
||||
type: 'void',
|
||||
properties: {
|
||||
...(instruction.view ? { view: instruction.view } : {}),
|
||||
@ -407,7 +371,7 @@ export function NodeDefaultView(props) {
|
||||
),
|
||||
'x-decorator': 'FormV2',
|
||||
'x-use-decorator-props': 'useFormProviderProps',
|
||||
'x-component': 'Action.Drawer',
|
||||
'x-component': 'Action.Area',
|
||||
properties: {
|
||||
...(instruction.description
|
||||
? {
|
||||
@ -468,7 +432,45 @@ export function NodeDefaultView(props) {
|
||||
},
|
||||
} as ISchema,
|
||||
},
|
||||
};
|
||||
|
||||
return (
|
||||
<div className={cx(styles.nodeClass, `workflow-node-type-${data.type}`)}>
|
||||
<div
|
||||
role="button"
|
||||
aria-label={`${typeTitle}-${editingTitle}`}
|
||||
className={cx(styles.nodeCardClass, { configuring: editingConfig })}
|
||||
onClick={onOpenDrawer}
|
||||
>
|
||||
<div className={cx(styles.nodeMetaClass, 'workflow-node-meta')}>
|
||||
<Tag>{typeTitle}</Tag>
|
||||
<span className="workflow-node-id">{data.id}</span>
|
||||
</div>
|
||||
<Input.TextArea
|
||||
disabled={workflow.executed}
|
||||
value={editingTitle}
|
||||
onChange={(ev) => setEditingTitle(ev.target.value)}
|
||||
onBlur={(ev) => onChangeTitle(ev.target.value)}
|
||||
autoSize
|
||||
/>
|
||||
<RemoveButton />
|
||||
<JobButton />
|
||||
<ActionContextProvider
|
||||
value={{
|
||||
visible: editingConfig,
|
||||
setVisible: resetForm,
|
||||
formValueChanged,
|
||||
setFormValueChanged,
|
||||
}}
|
||||
>
|
||||
<FormProvider form={form}>
|
||||
<SchemaComponent
|
||||
scope={{
|
||||
...instruction.scope,
|
||||
useFormProviderProps,
|
||||
}}
|
||||
components={instruction.components}
|
||||
schema={schema}
|
||||
/>
|
||||
</FormProvider>
|
||||
</ActionContextProvider>
|
||||
|
@ -1,16 +1,14 @@
|
||||
import { useField, useForm } from '@tachybase/schema';
|
||||
import React from 'react';
|
||||
|
||||
import { useCollectionDataSource, useCollectionManager_deprecated } from '@tachybase/client';
|
||||
import { useField, useForm } from '@tachybase/schema';
|
||||
|
||||
import { Instruction } from '.';
|
||||
import CollectionFieldset from '../components/CollectionFieldset';
|
||||
import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
|
||||
|
||||
import { RadioWithTooltip } from '../components/RadioWithTooltip';
|
||||
import { NAMESPACE, lang } from '../locale';
|
||||
import { lang, NAMESPACE } from '../locale';
|
||||
import { collection, filter, values } from '../schemas/collection';
|
||||
import { isValidFilter } from '../utils';
|
||||
import { Instruction } from '.';
|
||||
|
||||
function IndividualHooksRadioWithTooltip({ onChange, ...props }) {
|
||||
const { getCollectionFields } = useCollectionManager_deprecated();
|
||||
|
@ -1,10 +1,10 @@
|
||||
import React from 'react';
|
||||
import { ISchema } from '@tachybase/schema';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { message } from 'antd';
|
||||
|
||||
import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@tachybase/client';
|
||||
import { ISchema } from '@tachybase/schema';
|
||||
|
||||
import { message } from 'antd';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
import { ExecutionStatusOptions } from '../constants';
|
||||
import { NAMESPACE } from '../locale';
|
||||
|
@ -35,6 +35,18 @@ const useStyles = createStyles(({ css, token }) => {
|
||||
}
|
||||
}
|
||||
|
||||
.workflow-content {
|
||||
display: flex;
|
||||
height: 100%;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.workflow-operator-area {
|
||||
padding: 8px;
|
||||
background-color: white;
|
||||
width: 800px;
|
||||
}
|
||||
|
||||
.workflow-canvas-wrapper {
|
||||
flex-grow: 1;
|
||||
overflow: hidden;
|
||||
|
@ -1,29 +1,28 @@
|
||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Button, Input, Tag, message } from 'antd';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { InfoOutlined } from '@ant-design/icons';
|
||||
import { createForm } from '@tachybase/schema';
|
||||
import { ISchema, useForm } from '@tachybase/schema';
|
||||
|
||||
import {
|
||||
ActionContextProvider,
|
||||
css,
|
||||
cx,
|
||||
FieldNames,
|
||||
FormProvider,
|
||||
SchemaComponent,
|
||||
SchemaInitializerItemType,
|
||||
css,
|
||||
cx,
|
||||
useAPIClient,
|
||||
useActionContext,
|
||||
useAPIClient,
|
||||
useCompile,
|
||||
usePlugin,
|
||||
useResourceActionContext,
|
||||
} from '@tachybase/client';
|
||||
import { createForm, ISchema, useForm } from '@tachybase/schema';
|
||||
|
||||
import { InfoOutlined } from '@ant-design/icons';
|
||||
import { Button, Input, message, Tag } from 'antd';
|
||||
import { cloneDeep } from 'lodash';
|
||||
|
||||
import WorkflowPlugin from '..';
|
||||
import { useFlowContext } from '../FlowContext';
|
||||
import { DrawerDescription } from '../components/DrawerDescription';
|
||||
import { NAMESPACE, lang } from '../locale';
|
||||
import { useFlowContext } from '../FlowContext';
|
||||
import { lang, NAMESPACE } from '../locale';
|
||||
import useStyles from '../style';
|
||||
import { UseVariableOptions, VariableOption } from '../variable';
|
||||
|
||||
@ -264,7 +263,7 @@ export const TriggerConfig = () => {
|
||||
drawer: {
|
||||
type: 'void',
|
||||
title: titleText,
|
||||
'x-component': 'Action.Drawer',
|
||||
'x-component': 'Action.Area',
|
||||
'x-decorator': 'FormV2',
|
||||
'x-use-decorator-props': 'useFormProviderProps',
|
||||
properties: {
|
||||
|
Loading…
Reference in New Issue
Block a user