mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 01:36:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(FilterBlocks): allow adding filter blocks in popup even without a… (#5502)

Browse Source 
* fix(FilterBlocks): allow adding filter blocks in popup even without association fields

* chore: make e2e more stable
This commit is contained in:
Zeke Zhang 2024-10-24 11:46:17 +08:00 committed by GitHub
parent f148536491
commit 4fcf7e3815
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/client/src/modules/fields/__e2e__/component/Input.Preview/basic.test.ts
View File

@ -32,7 +32,12 @@ test.describe('Input.Preview', () => {
// 4. 切换图片大小到 Large，大小切换正常 // 4. 切换图片大小到 Large，大小切换正常
await page.getByLabel('block-item-CollectionField-').hover(); await page.getByLabel('block-item-CollectionField-').hover();
await page.getByLabel('designer-schema-settings-CollectionField-fieldSettings:FormItem-general-general').hover(); await page.getByLabel('designer-schema-settings-CollectionField-fieldSettings:FormItem-general-general').hover();
await page.getByRole('menuitem', { name: 'Size Small' }).click(); await page.getByRole('menuitem', { name: 'Size Small' }).click({
position: {
x: 160,
y: 10,
},
});
await page.getByRole('option', { name: 'Large' }).click(); await page.getByRole('option', { name: 'Large' }).click();
await expect(page.getByLabel('block-item-CollectionField-').getByRole('img').first()).toHaveJSProperty('width', 72); await expect(page.getByLabel('block-item-CollectionField-').getByRole('img').first()).toHaveJSProperty('width', 72);

12
packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx
View File

@ -8,7 +8,7 @@
*/ */
import { Schema } from '@formily/react'; import { Schema } from '@formily/react';
import { useCallback, useMemo } from 'react'; import { useCallback } from 'react';
import { import {
useActionAvailable, useActionAvailable,
useCollection, useCollection,
@ -283,16 +283,6 @@ const commonOptions = {
name: 'filterBlocks', name: 'filterBlocks',
title: '{{t("Filter blocks")}}', title: '{{t("Filter blocks")}}',
type: 'itemGroup', type: 'itemGroup',
useVisible() {
const collection = useCollection();
return useMemo(
() =>
collection.fields.some(
(field) => canMakeAssociationBlock(field) && ['hasMany', 'belongsToMany'].includes(field.type),
),
[collection.fields],
);
},
children: [ children: [
{ {
name: 'filterForm', name: 'filterForm',