mirror of
https://gitee.com/baidu/amis.git
synced 2024-12-16 01:40:53 +08:00
Merge branch 'master' into feat-optimize-5
This commit is contained in:
commit
448da314d0
@ -740,14 +740,6 @@ const ACTION_TYPE_TREE = (manager: any): RendererPluginAction[] => {
|
|||||||
labelField: 'label',
|
labelField: 'label',
|
||||||
valueField: 'value',
|
valueField: 'value',
|
||||||
required: true,
|
required: true,
|
||||||
visibleOn: `data.__rendererName && ${SHOW_SELECT_PROP}`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'key',
|
|
||||||
type: 'input-text',
|
|
||||||
placeholder: '变量名',
|
|
||||||
required: true,
|
|
||||||
visibleOn: `data.__rendererName && !${SHOW_SELECT_PROP} && __comboType === 'appoint'`
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'val',
|
name: 'val',
|
||||||
@ -826,7 +818,7 @@ const ACTION_TYPE_TREE = (manager: any): RendererPluginAction[] => {
|
|||||||
label: '赋值',
|
label: '赋值',
|
||||||
size: 'lg',
|
size: 'lg',
|
||||||
mode: 'horizontal',
|
mode: 'horizontal',
|
||||||
visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && __rendererName !== 'combo'`,
|
visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && !${SHOW_SELECT_PROP} && __rendererName !== 'combo'`,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -189,20 +189,12 @@ export const COMMON_ACTION_SCHEMA_MAP: {
|
|||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
name: 'key',
|
name: 'key',
|
||||||
type: 'select',
|
type: 'input-text',
|
||||||
placeholder: '变量名',
|
placeholder: '变量名',
|
||||||
source: '${__setValueDs}',
|
source: '${__setValueDs}',
|
||||||
labelField: 'label',
|
labelField: 'label',
|
||||||
valueField: 'value',
|
valueField: 'value',
|
||||||
required: true,
|
required: true,
|
||||||
visibleOn: `data.__rendererName && ${SHOW_SELECT_PROP}`
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'key',
|
|
||||||
type: 'input-text',
|
|
||||||
placeholder: '变量名',
|
|
||||||
required: true,
|
|
||||||
visibleOn: `data.__rendererName && !${SHOW_SELECT_PROP}`
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'val',
|
name: 'val',
|
||||||
|
Loading…
Reference in New Issue
Block a user