mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 10:17:00 +00:00
fix(plugin-workflow): fix some ux (#313)
* fix(plugin-workflow): fix some ux * style(plugin-workflow): optimize node remove button style
This commit is contained in:
Junyi
GitHub
parent
f45deaa351
commit
fefa1fc0c9
@ -263,6 +263,14 @@ export function Operand({
|
||||
display: flex;
|
||||
gap: .5em;
|
||||
align-items: center;
|
||||
|
||||
.ant-select,
|
||||
.ant-cascader-picker,
|
||||
.ant-picker,
|
||||
.ant-input-number,
|
||||
.ant-input-affix-wrapper{
|
||||
width: auto;
|
||||
}
|
||||
`}>
|
||||
<Cascader
|
||||
allowClear={false}
|
||||
@ -378,28 +386,24 @@ export const CollectionFieldset = observer(({ value, onChange, useProps }: any)
|
||||
<fieldset className={css`
|
||||
margin-top: .5em;
|
||||
|
||||
.ant-formily-item{
|
||||
.ant-formily-item-label{
|
||||
line-height: 32px;
|
||||
}
|
||||
> .ant-formily-item{
|
||||
flex-direction: column;
|
||||
|
||||
.ant-select,
|
||||
.ant-cascader-picker,
|
||||
.ant-picker,
|
||||
.ant-input-number,
|
||||
.ant-input-affix-wrapper{
|
||||
width: auto;
|
||||
> .ant-formily-item-label{
|
||||
line-height: 32px;
|
||||
}
|
||||
}
|
||||
`}>
|
||||
{fields.length
|
||||
? fields.map(field => {
|
||||
? fields
|
||||
.filter(field => !field.hidden)
|
||||
.map(field => {
|
||||
const operand = typeof value[field.name] === 'string'
|
||||
? parseStringValue(value[field.name], VTypes)
|
||||
: { type: 'constant', value: value[field.name] };
|
||||
|
||||
return (
|
||||
<FormItem label={compile(field.uiSchema?.title)}>
|
||||
<FormItem label={compile(field.uiSchema?.title ?? field.name)} labelAlign="left">
|
||||
<VariableTypesContext.Provider value={VTypes}>
|
||||
<Operand
|
||||
value={operand}
|
||||
|
||||
@ -125,19 +125,26 @@ export function RemoveButton() {
|
||||
onNodeRemoved(node);
|
||||
}
|
||||
|
||||
if (!nodes.find(item => item.upstream === current && item.branchIndex != null)) {
|
||||
return onOk();
|
||||
}
|
||||
const hasBranches = !nodes.find(item => item.upstream === current && item.branchIndex != null);
|
||||
const message = hasBranches
|
||||
? '确定删除该节点吗？'
|
||||
: '节点包含分支，将同时删除其所有分支下的子节点，确定继续？';
|
||||
|
||||
Modal.confirm({
|
||||
title: '删除分支',
|
||||
content: '节点包含分支，将同时删除其所有分支下的子节点，确定继续？',
|
||||
title: '删除节点',
|
||||
content: message,
|
||||
onOk
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<Button type="text" shape="circle" icon={<DeleteOutlined />} onClick={onRemove} />
|
||||
<Button
|
||||
type="text"
|
||||
shape="circle"
|
||||
icon={<DeleteOutlined />}
|
||||
onClick={onRemove}
|
||||
className="workflow-node-remove-button"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -193,6 +193,7 @@ export const workflowSchema: ISchema = {
|
||||
type: 'boolean',
|
||||
'x-component': 'CollectionField',
|
||||
'x-read-pretty': true,
|
||||
default: false
|
||||
},
|
||||
}
|
||||
},
|
||||
@ -213,22 +214,22 @@ export const workflowSchema: ISchema = {
|
||||
title: '配置流程',
|
||||
'x-component': 'WorkflowLink'
|
||||
},
|
||||
executions: {
|
||||
type: 'void',
|
||||
title: '执行历史',
|
||||
'x-component': 'Action.Link',
|
||||
'x-component-props': {
|
||||
type: 'primary',
|
||||
},
|
||||
properties: {
|
||||
drawer: {
|
||||
type: 'void',
|
||||
title: '执行历史',
|
||||
'x-component': 'Action.Drawer',
|
||||
properties: executionSchema
|
||||
}
|
||||
}
|
||||
},
|
||||
// executions: {
|
||||
// type: 'void',
|
||||
// title: '执行历史',
|
||||
// 'x-component': 'Action.Link',
|
||||
// 'x-component-props': {
|
||||
// type: 'primary',
|
||||
// },
|
||||
// properties: {
|
||||
// drawer: {
|
||||
// type: 'void',
|
||||
// title: '执行历史',
|
||||
// 'x-component': 'Action.Drawer',
|
||||
// properties: executionSchema
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
update: {
|
||||
type: 'void',
|
||||
title: '{{ t("Edit") }}',
|
||||
@ -279,18 +280,18 @@ export const workflowSchema: ISchema = {
|
||||
},
|
||||
},
|
||||
},
|
||||
delete: {
|
||||
type: 'void',
|
||||
title: '{{ t("Delete") }}',
|
||||
'x-component': 'Action.Link',
|
||||
'x-component-props': {
|
||||
confirm: {
|
||||
title: "{{t('Delete record')}}",
|
||||
content: "{{t('Are you sure you want to delete it?')}}",
|
||||
},
|
||||
useAction: '{{ cm.useDestroyActionAndRefreshCM }}',
|
||||
},
|
||||
},
|
||||
// delete: {
|
||||
// type: 'void',
|
||||
// title: '{{ t("Delete") }}',
|
||||
// 'x-component': 'Action.Link',
|
||||
// 'x-component-props': {
|
||||
// confirm: {
|
||||
// title: "{{t('Delete record')}}",
|
||||
// content: "{{t('Are you sure you want to delete it?')}}",
|
||||
// },
|
||||
// useAction: '{{ cm.useDestroyActionAndRefreshCM }}',
|
||||
// },
|
||||
// },
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -108,12 +108,29 @@ export const nodeCardClass = css`
|
||||
background: #fff;
|
||||
padding: 1em;
|
||||
box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
|
||||
|
||||
.workflow-node-remove-button{
|
||||
position: absolute;
|
||||
right: -.5em;
|
||||
top: -.5em;
|
||||
color: #999;
|
||||
opacity: 0;
|
||||
transition: opacity .3s ease;
|
||||
|
||||
&:hover {
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover{
|
||||
.workflow-node-remove-button{
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
export const nodeHeaderClass = css`
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
position: relative;
|
||||
`;
|
||||
|
||||
export const nodeTitleClass = css`
|
||||
|
||||
Loading…
Reference in New Issue
Block a user