fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 23:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-05-08 12:36:23 +00:00
commit 3a461fb77a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx
View File

@ -131,7 +131,7 @@ export const FormFieldLinkageRuleAction = observer(
/>
)}
{!props.disabled && (
<a role="button" aria-label="icon-close">
<a role="button" aria-label="icon-close" style={{ verticalAlign: 'text-top' }}>
<CloseCircleOutlined onClick={() => remove()} style={{ color: '#bfbfbf' }} />
</a>
)}

13
packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx
View File

@ -79,7 +79,7 @@ export const ValueDynamicComponent = (props: ValueDynamicComponentProps) => {
[collectionName, mode, setValue],
);
const textAreaStyle = useMemo(() => {
return { minWidth: 460, borderRadius: 0 };
return { minWidth: 390, borderRadius: 0 };
}, []);
const compatScope = useMemo(() => {
return compatOldVariables(scope, {
@ -120,7 +120,16 @@ export const ValueDynamicComponent = (props: ValueDynamicComponentProps) => {
// 表达式
express: (
<div role="button" aria-label="dynamic-component-linkage-rules" style={expressStyle}>
<div
role="button"
aria-label="dynamic-component-linkage-rules"
style={expressStyle}
className={css`
.x-button {
height: auto !important;
}
`}
>
<Variable.TextArea
value={fieldValue?.value}
onChange={handleChangeOfExpress}