diff --git a/packages/core/client/src/acl/style.less b/packages/core/client/src/acl/style.less index bf8d58f1a..0962adf8d 100644 --- a/packages/core/client/src/acl/style.less +++ b/packages/core/client/src/acl/style.less @@ -3,7 +3,7 @@ .ant-space-item:empty:not(:last-child) + .ant-space-item-split { display: none; } - .ant-space-item-split:has(+ .ant-space-item:empty) { + .ant-space-item-split:has(+ .ant-space-item:last-child:empty) { display: none; } } diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index caaa528e3..eb1a1af93 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -98,48 +98,53 @@ export const Action: ComposedAction = observer((props: any) => { field.linkageProperty = {}; linkageRules .filter((k) => !k.disabled) - .map((v) => { + .forEach((v) => { return v.actions?.map((h) => { linkageAction(h.operator, field, v.condition, values); }); }); - }, [linkageRules, values]); - const renderButton = () => ( - } - disabled={disabled} - style={{ - display: !designable && field?.data?.hidden && 'none', - opacity: designable && field?.data?.hidden && 0.1, - }} - onClick={(e: React.MouseEvent) => { - if (!disabled) { - e.preventDefault(); - e.stopPropagation(); - const onOk = () => { - onClick?.(e); - setVisible(true); - run(); - }; - if (confirm) { - Modal.confirm({ - ...confirm, - onOk, - }); - } else { - onOk(); + }, [linkageRules, values, designable]); + + const renderButton = () => { + if (!designable && field?.data?.hidden) { + return null; + } + return ( + } + disabled={disabled} + style={{ + opacity: designable && field?.data?.hidden && 0.1, + }} + onClick={(e: React.MouseEvent) => { + if (!disabled) { + e.preventDefault(); + e.stopPropagation(); + const onOk = () => { + onClick?.(e); + setVisible(true); + run(); + }; + if (confirm) { + Modal.confirm({ + ...confirm, + onOk, + }); + } else { + onOk(); + } } - } - }} - component={tarComponent || Button} - className={classnames(className, actionDesignerCss)} - > - {title || compile(fieldSchema.title)} - - - ); + }} + component={tarComponent || Button} + className={classnames(className, actionDesignerCss)} + > + {title || compile(fieldSchema.title)} + + + ); + }; return ( { return ( - {snapshot ? ( + {snapshot || isTagsMode ? ( text - ) : isTagsMode ? ( - {text} ) : ( {