ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(plugin-workflow): fix schema name conflict (#1087)

Browse Source
This commit is contained in:
Junyi 2022-11-14 23:26:44 +08:00 committed by GitHub
parent c470209ecd
commit 46161e8fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/plugins/workflow/src/client/WorkflowCanvas.tsx
View File

@ -3,7 +3,6 @@ import { Link, useHistory } from 'react-router-dom';
import { Dropdown, Menu, Button, Tag, Switch, message, Breadcrumb } from 'antd'; import { Dropdown, Menu, Button, Tag, Switch, message, Breadcrumb } from 'antd';
import { DownOutlined, RightOutlined, EllipsisOutlined } from '@ant-design/icons'; import { DownOutlined, RightOutlined, EllipsisOutlined } from '@ant-design/icons';
import { cx } from '@emotion/css'; import { cx } from '@emotion/css';
import { useTranslation } from 'react-i18next';
import classnames from 'classnames'; import classnames from 'classnames';
import { import {
@ -18,11 +17,10 @@ import { FlowContext } from './FlowContext';
import { branchBlockClass, nodeCardClass, nodeMetaClass, workflowVersionDropdownClass } from './style'; import { branchBlockClass, nodeCardClass, nodeMetaClass, workflowVersionDropdownClass } from './style';
import { TriggerConfig } from './triggers'; import { TriggerConfig } from './triggers';
import { Branch } from './Branch'; import { Branch } from './Branch';
import { executionCollection, executionSchema } from './schemas/executions'; import { executionSchema } from './schemas/executions';
import { ExecutionLink } from './ExecutionLink'; import { ExecutionLink } from './ExecutionLink';
import { ExecutionResourceProvider } from './ExecutionResourceProvider'; import { ExecutionResourceProvider } from './ExecutionResourceProvider';
import { lang } from './locale';
import { lang, NAMESPACE } from './locale';
@ -174,12 +172,7 @@ export function WorkflowCanvas() {
</Dropdown> </Dropdown>
<ActionContext.Provider value={{ visible, setVisible }}> <ActionContext.Provider value={{ visible, setVisible }}>
<SchemaComponent <SchemaComponent
schema={{ schema={executionSchema}
type: 'void',
properties: {
drawer: executionSchema
}
}}
components={{ components={{
ExecutionResourceProvider, ExecutionResourceProvider,
ExecutionLink ExecutionLink

1
packages/plugins/workflow/src/client/schemas/executions.tsx
View File

@ -51,6 +51,7 @@ export const executionCollection = {
export const executionSchema = { export const executionSchema = {
type: 'void', type: 'void',
name: 'executionHistoryDrawer',
title: `{{t("Execution history", { ns: "${NAMESPACE}" })}}`, title: `{{t("Execution history", { ns: "${NAMESPACE}" })}}`,
'x-component': 'Action.Drawer', 'x-component': 'Action.Drawer',
properties: { properties: {