Merge branch 'main' into next

CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.3.38-beta](https://github.com/nocobase/nocobase/compare/v1.3.37-beta...v1.3.38-beta) - 2024-10-24
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - pagination issue in list block with simple pagination collection ([#5500](https://github.com/nocobase/nocobase/pull/5500)) by @katherinehhh
+
+  - In non-config mode, display only the current collection  in the edit form. ([#5499](https://github.com/nocobase/nocobase/pull/5499)) by @katherinehhh
+
+- **[Workflow: HTTP request node]** fix special white space appears when paste content into variable textarea caused issue ([#5497](https://github.com/nocobase/nocobase/pull/5497)) by @mytharcher
+
+- **[Departments]** Fix the issue of incorrect external data source permissions check under the department role by @2013xile
+
 ## [v1.3.37-beta](https://github.com/nocobase/nocobase/compare/v1.3.36-beta...v1.3.37-beta) - 2024-10-23
 
 ### 🚀 Improvements

CHANGELOG.zh-CN.md

@@ -5,6 +5,19 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.3.38-beta](https://github.com/nocobase/nocobase/compare/v1.3.37-beta...v1.3.38-beta) - 2024-10-24
+
+### 🐛 修复
+
+- **[client]**
+  - 使用简单分页的数据表在列表区块上分页异常 ([#5500](https://github.com/nocobase/nocobase/pull/5500)) by @katherinehhh
+
+  - 在非配置状态下，编辑表单应只显示本表区块 ([#5499](https://github.com/nocobase/nocobase/pull/5499)) by @katherinehhh
+
+- **[工作流：HTTP 请求节点]** 修复变量文本输入框中在粘贴时可能产生非标准空格导致服务端逻辑错误的问题 ([#5497](https://github.com/nocobase/nocobase/pull/5497)) by @mytharcher
+
+- **[部门]** 修复在所属部门角色下外部数据源权限判断不正确的问题 by @2013xile
+
 ## [v1.3.37-beta](https://github.com/nocobase/nocobase/compare/v1.3.36-beta...v1.3.37-beta) - 2024-10-23
 
 ### 🚀 优化

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

@@ -32,7 +32,12 @@ test.describe('Input.Preview', () => {
     // 4. 切换图片大小到 Large，大小切换正常
     await page.getByLabel('block-item-CollectionField-').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 expect(page.getByLabel('block-item-CollectionField-').getByRole('img').first()).toHaveJSProperty('width', 72);
 

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

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