mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 13:39:24 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
813be720de
@ -100,6 +100,14 @@ export const ValueDynamicComponent = (props: ValueDynamicComponentProps) => {
|
|||||||
.ant-checkbox-wrapper {
|
.ant-checkbox-wrapper {
|
||||||
margin-left: 50%;
|
margin-left: 50%;
|
||||||
}
|
}
|
||||||
|
.ant-select-selector {
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
border-bottom-left-radius: 0;
|
||||||
|
}
|
||||||
|
.ant-picker {
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
border-bottom-left-radius: 0;
|
||||||
|
}
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
{React.createElement(DynamicComponent, {
|
{React.createElement(DynamicComponent, {
|
||||||
|
@ -34,7 +34,12 @@ export const useValues = (options) => {
|
|||||||
const dataIndex = field.data?.targetFields;
|
const dataIndex = field.data?.targetFields;
|
||||||
const option = (dataIndex && findOption(dataIndex, options)) || {};
|
const option = (dataIndex && findOption(dataIndex, options)) || {};
|
||||||
const operators = option?.operators || [];
|
const operators = option?.operators || [];
|
||||||
field.data.operators = operators;
|
field.data.operators = operators?.filter((v) => {
|
||||||
|
if (dataIndex.length > 1) {
|
||||||
|
return v.value !== 'value';
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
field.data.schema = option?.schema;
|
field.data.schema = option?.schema;
|
||||||
};
|
};
|
||||||
useEffect(value2data, [logic]);
|
useEffect(value2data, [logic]);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user