From c4873828fa62afc5bcac5055c5d58bf3c3267d9f Mon Sep 17 00:00:00 2001
From: "nocobase[bot]" <179432756+nocobase[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:21:45 +0000
Subject: [PATCH 1/2] docs: update changelogs

---
 CHANGELOG.md       | 26 ++++++++++++++++++++++++++
 CHANGELOG.zh-CN.md | 26 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcf15c894c..72b52a0f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,32 @@ 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.55](https://github.com/nocobase/nocobase/compare/v1.3.54...v1.3.55) - 2024-12-03
+
+### 🚀 Improvements
+
+- **[client]** To use icons with more accurate meanings for block initializers ([#5757](https://github.com/nocobase/nocobase/pull/5757)) by @mytharcher
+
+### 🐛 Bug Fixes
+
+- **[client]**
+  - Fix E2E cases based on changed icons ([#5768](https://github.com/nocobase/nocobase/pull/5768)) by @mytharcher
+
+  - Fix select field to display blank when data is empty ([#5762](https://github.com/nocobase/nocobase/pull/5762)) by @katherinehhh
+
+- **[database]** Fix update hasOne/belongsTo association values without foreign key ([#5754](https://github.com/nocobase/nocobase/pull/5754)) by @chareice
+
+- **[Data source manager]** Fix  incorrect display of source key ([#5771](https://github.com/nocobase/nocobase/pull/5771)) by @katherinehhh
+
+- **[Workflow: Custom action event]**
+  - Allow all roles to triggering custom action event in external data sources by @mytharcher
+
+  - Fix default data source as main by @mytharcher
+
+  - Fix data source error when not matched by @mytharcher
+
+  - Fix custom action trigger not triggering on association by @mytharcher
+
 ## [v1.3.53](https://github.com/nocobase/nocobase/compare/v1.3.52...v1.3.53) - 2024-11-28
 
 ### 🚀 Improvements
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index bddaec6fc8..f9db2b600b 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,6 +5,32 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.3.55](https://github.com/nocobase/nocobase/compare/v1.3.54...v1.3.55) - 2024-12-03
+
+### 🚀 优化
+
+- **[client]** 区块初始化器使用更匹配类型含义的图标 ([#5757](https://github.com/nocobase/nocobase/pull/5757)) by @mytharcher
+
+### 🐛 修复
+
+- **[client]**
+  - 修复图标变更后导致的 E2E 用例执行失败 ([#5768](https://github.com/nocobase/nocobase/pull/5768)) by @mytharcher
+
+  - 修复 select 数据为空时应显示空白 ([#5762](https://github.com/nocobase/nocobase/pull/5762)) by @katherinehhh
+
+- **[database]** 修复带外键更新关系字段的问题 ([#5754](https://github.com/nocobase/nocobase/pull/5754)) by @chareice
+
+- **[数据源管理]** 修复 source key 显示不正确 ([#5771](https://github.com/nocobase/nocobase/pull/5771)) by @katherinehhh
+
+- **[工作流：自定义操作事件]**
+  - 允许所有角色都可触发外部数据源数据表上的自定义操作事件 by @mytharcher
+
+  - 修复自定义操作事件默认数据源 by @mytharcher
+
+  - 修复自定义操作事件数据源不匹配的错误 by @mytharcher
+
+  - 修复自定义操作事件在关系区块无法触发的问题 by @mytharcher
+
 ## [v1.3.53](https://github.com/nocobase/nocobase/compare/v1.3.52...v1.3.53) - 2024-11-28
 
 ### 🚀 优化

From 38e79d41af198cf9675c9ce7ecfb9f77f8a366ae Mon Sep 17 00:00:00 2001
From: gchust <gchust@qq.com>
Date: Tue, 3 Dec 2024 19:19:41 +0800
Subject: [PATCH 2/2] fix: cannot set highlight style for link action button
 (#5780)

---
 packages/core/client/src/block-provider/hooks/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts
index 25f1d9457a..7db7915373 100644
--- a/packages/core/client/src/block-provider/hooks/index.ts
+++ b/packages/core/client/src/block-provider/hooks/index.ts
@@ -1606,12 +1606,13 @@ export function useLinkActionProps(componentProps?: any) {
   const { t } = useTranslation();
   const url = componentPropsValue?.['url'];
   const searchParams = componentPropsValue?.['params'] || [];
+  const type = componentPropsValue?.['type'] || 'default';
   const openInNewWindow = fieldSchema?.['x-component-props']?.['openInNewWindow'];
   const { parseURLAndParams } = useParseURLAndParams();
   const basenameOfCurrentRouter = useRouterBasename();
 
   return {
-    type: 'default',
+    type,
     async onClick() {
       if (!url) {
         message.warning(t('Please configure the URL'));