feat: improve ui design for linkage action (#1659)
* feat: improve ui design for linkage action * revert * fix: not working
This commit is contained in:
parent
06d67a93ab
commit
1654b42037
@ -3,7 +3,7 @@
|
|||||||
.ant-space-item:empty:not(:last-child) + .ant-space-item-split {
|
.ant-space-item:empty:not(:last-child) + .ant-space-item-split {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
.ant-space-item-split:has(+ .ant-space-item:empty) {
|
.ant-space-item-split:has(+ .ant-space-item:last-child:empty) {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -98,20 +98,24 @@ export const Action: ComposedAction = observer((props: any) => {
|
|||||||
field.linkageProperty = {};
|
field.linkageProperty = {};
|
||||||
linkageRules
|
linkageRules
|
||||||
.filter((k) => !k.disabled)
|
.filter((k) => !k.disabled)
|
||||||
.map((v) => {
|
.forEach((v) => {
|
||||||
return v.actions?.map((h) => {
|
return v.actions?.map((h) => {
|
||||||
linkageAction(h.operator, field, v.condition, values);
|
linkageAction(h.operator, field, v.condition, values);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}, [linkageRules, values]);
|
}, [linkageRules, values, designable]);
|
||||||
const renderButton = () => (
|
|
||||||
|
const renderButton = () => {
|
||||||
|
if (!designable && field?.data?.hidden) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return (
|
||||||
<SortableItem
|
<SortableItem
|
||||||
{...others}
|
{...others}
|
||||||
loading={field?.data?.loading}
|
loading={field?.data?.loading}
|
||||||
icon={<Icon type={icon} />}
|
icon={<Icon type={icon} />}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
style={{
|
style={{
|
||||||
display: !designable && field?.data?.hidden && 'none',
|
|
||||||
opacity: designable && field?.data?.hidden && 0.1,
|
opacity: designable && field?.data?.hidden && 0.1,
|
||||||
}}
|
}}
|
||||||
onClick={(e: React.MouseEvent) => {
|
onClick={(e: React.MouseEvent) => {
|
||||||
@ -140,6 +144,7 @@ export const Action: ComposedAction = observer((props: any) => {
|
|||||||
<Designer {...designerProps} />
|
<Designer {...designerProps} />
|
||||||
</SortableItem>
|
</SortableItem>
|
||||||
);
|
);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ActionContext.Provider
|
<ActionContext.Provider
|
||||||
|
@ -56,10 +56,8 @@ export const ReadPrettyRecordPicker: React.FC = observer((props: any) => {
|
|||||||
return (
|
return (
|
||||||
<Fragment key={`${record.id}_${index}`}>
|
<Fragment key={`${record.id}_${index}`}>
|
||||||
<span>
|
<span>
|
||||||
{snapshot ? (
|
{snapshot || isTagsMode ? (
|
||||||
text
|
text
|
||||||
) : isTagsMode ? (
|
|
||||||
<Typography.Text underline>{text}</Typography.Text>
|
|
||||||
) : (
|
) : (
|
||||||
<a
|
<a
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user