test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-02 03:58:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore(amis-editor): Form配置面板中表达式使用变量，避免data被赋值导致取值错误 (#8680) (#8688)

Browse Source
This commit is contained in:
RUNZE LU 2023-11-10 17:51:31 +08:00 committed by GitHub
parent e92878229a
commit 3157498c88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/amis-editor/src/plugin/CRUD.tsx
View File

@ -578,7 +578,7 @@ export class CRUDPlugin extends BasePlugin {
name: 'filterColumnCount' name: 'filterColumnCount'
} }
], ],
visibleOn: 'data.features && data.features.includes("filter")' visibleOn: "${features && features.includes('filter')}"
}, },
{ {
name: 'columns', name: 'columns',

14
packages/amis-editor/src/plugin/Form/Form.tsx
View File

@ -474,7 +474,7 @@ export class FormPlugin extends BasePlugin {
return { return {
type: 'container', type: 'container',
className: 'form-item-gap', className: 'form-item-gap',
visibleOn: `data.feat === '${feat.value}' && (!data.dsType || data.dsType === '${builderKey}')`, visibleOn: `$\{feat === '${feat.value}' && (!dsType || dsType === '${builderKey}')}`,
body: flatten([ body: flatten([
builder.makeSourceSettingForm({ builder.makeSourceSettingForm({
feat: feat.value, feat: feat.value,
@ -685,14 +685,15 @@ export class FormPlugin extends BasePlugin {
const dsSettings = flatten( const dsSettings = flatten(
this.Features.map(feat => this.Features.map(feat =>
this.dsManager.buildCollectionFromBuilders( this.dsManager.buildCollectionFromBuilders(
(builder, builderKey, index) => ({ (builder, builderKey, index) => {
return {
type: 'container', type: 'container',
className: 'form-item-gap', className: 'form-item-gap',
visibleOn: `data.feat === '${ visibleOn: `$\{feat === '${
feat.value feat.value
}' && (data.dsType == null ? '${builderKey}' === '${ }' && (dsType == null ? '${builderKey}' === '${
defaultDsType || ApiDSBuilderKey defaultDsType || ApiDSBuilderKey
}' : data.dsType === '${builderKey}')`, }' : dsType === '${builderKey}')}`,
body: flatten([ body: flatten([
builder.makeSourceSettingForm({ builder.makeSourceSettingForm({
feat: feat.value, feat: feat.value,
@ -704,7 +705,8 @@ export class FormPlugin extends BasePlugin {
} }
}) })
]) ])
}) };
}
) )
) )
); );