fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 14:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-11-28 04:26:59 +00:00
commit 86679c4953
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/variable/Input.tsx
View File

@ -460,7 +460,7 @@ export function Input(props: VariableInputProps) {
</div> </div>
) : ( ) : (
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
{children && isFieldValue ? ( {children && (isFieldValue || !nullable) ? (
children children
) : ConstantComponent ? ( ) : ConstantComponent ? (
<ConstantComponent <ConstantComponent

6
packages/core/client/src/schema-initializer/utils.ts
View File

@ -83,13 +83,13 @@ export const useRemoveGridFormItem = () => {
}; };
}; };
export const findTableColumn = (schema: Schema, key: string, action: string, deepth = 0) => { export const findTableColumn = (schema: Schema, key: string, action: string, name: string) => {
return schema.reduceProperties((buf, s) => { return schema.reduceProperties((buf, s) => {
if (s[key] === action) { if (s[key] === action && (!name || s.name === name)) {
return s; return s;
} }
const c = s.reduceProperties((buf, s) => { const c = s.reduceProperties((buf, s) => {
if (s[key] === action) { if (s[key] === action && (!name || s.name === name)) {
return s; return s;
} }
return buf; return buf;