Merge branch 'next' into develop

packages/core/client/src/block-provider/hooks/index.ts

@@ -36,6 +36,7 @@ import { useAPIClient, useRequest } from '../../api-client';
 import { useNavigateNoUpdate } from '../../application/CustomRouterContextProvider';
 import { useFormBlockContext } from '../../block-provider/FormBlockProvider';
 import { CollectionOptions, useCollectionManager_deprecated, useCollection_deprecated } from '../../collection-manager';
+import { getVariableValue } from '../../common/getVariableValue';
 import { DataBlock, useFilterBlock } from '../../filter-provider/FilterProvider';
 import { mergeFilter, transformToFilter } from '../../filter-provider/utils';
 import { useTreeParentRecord } from '../../modules/blocks/data-blocks/table/TreeRecordProvider';
@@ -52,7 +53,6 @@ import { useBlockRequestContext, useFilterByTk, useParamsFromRecord } from '../B
 import { useOperators } from '../CollectOperators';
 import { useDetailsBlockContext } from '../DetailsBlockProvider';
 import { TableFieldResource } from '../TableFieldProvider';
-import { getVariableValue } from '../../common/getVariableValue';
 
 export * from './useBlockHeightProps';
 export * from './useDataBlockParentRecord';
@@ -527,6 +527,9 @@ const useDoFilter = () => {
             if (block.dataLoadingMode === 'manual' && _.isEmpty(storedFilter[uid])) {
               return block.clearData();
             }
+
+            // 存储当前的筛选条件，供其它筛选区块使用
+            _.set(block.service.params, '1.filters', storedFilter);
             return block.doFilter(
               {
                 ...param,

packages/core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaSettings.test.ts

@@ -20,7 +20,7 @@ test.describe('list block schema settings', () => {
         await page.getByLabel('designer-schema-settings-CardItem-List.Designer-general').hover();
       },
       supportedOptions: [
-        'Edit block title',
+        'Edit block title & description',
         'Set the data scope',
         'Set default sorting rules',
         'Records per page',

packages/plugins/@nocobase/plugin-data-visualization/src/client/__e2e__/defaultValue.test.ts

@@ -27,7 +27,7 @@ test.describe('defaultValue', () => {
 
     // 2. Set a date variable default value for the custom field, after saving, the date input box should display the default value
     await page.getByLabel('block-item-DatePicker.').hover();
-    await page.getByLabel('designer-schema-settings-DatePicker.RangePicker-ChartFilterItemDesigner').hover();
+    await page.getByLabel('designer-schema-settings-DatePicker.RangePicker-chart:filterForm:item').hover();
     await page.getByRole('menuitem', { name: 'Set default value' }).click();
     await page.getByLabel('variable-button').click();
     await page.getByRole('menuitemcheckbox', { name: 'Date variables right' }).click();