Merge branch 'next' into develop

CHANGELOG.md

@@ -5,6 +5,18 @@ 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.5.20](https://github.com/nocobase/nocobase/compare/v1.5.19...v1.5.20) - 2025-03-03
+
+### 🐛 Bug Fixes
+
+- **[client]** Pages with custom favicon briefly flash the NocoBase favicon during loading ([#6337](https://github.com/nocobase/nocobase/pull/6337)) by @zhangzhonghe
+
+- **[Block: Map]** Configuration settings for map field are missing/not visible ([#6336](https://github.com/nocobase/nocobase/pull/6336)) by @zhangzhonghe
+
+- **[Custom brand]** Pages with custom favicon briefly flash the NocoBase favicon during loading by @zhangzhonghe
+
+- **[Template print]** Restore from local failed when action template print and backup manager plugins were both enabled by @gchust
+
 ## [v1.5.19](https://github.com/nocobase/nocobase/compare/v1.5.18...v1.5.19) - 2025-03-01
 
 ### 🐛 Bug Fixes

CHANGELOG.zh-CN.md

@@ -5,6 +5,18 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。
 
+## [v1.5.20](https://github.com/nocobase/nocobase/compare/v1.5.19...v1.5.20) - 2025-03-03
+
+### 🐛 修复
+
+- **[client]** 已经自定义 favicon 的页面，在页面加载时会闪一下 NocoBase 的 favicon ([#6337](https://github.com/nocobase/nocobase/pull/6337)) by @zhangzhonghe
+
+- **[区块：地图]** 地图字段不显示配置项 ([#6336](https://github.com/nocobase/nocobase/pull/6336)) by @zhangzhonghe
+
+- **[自定义品牌]** 已经自定义 favicon 的页面，在页面加载时会闪一下 NocoBase 的 favicon by @zhangzhonghe
+
+- **[模板打印]** 模板打印插件和备份管理器插件都开启时，无法上传本地备份还原应用 by @gchust
+
 ## [v1.5.19](https://github.com/nocobase/nocobase/compare/v1.5.18...v1.5.19) - 2025-03-01
 
 ### 🐛 修复

packages/plugins/@nocobase/plugin-workflow/src/client/ExecutionCanvas.tsx

@@ -14,12 +14,14 @@ import { Link, useNavigate } from 'react-router-dom';
 import {
   ActionContextProvider,
   cx,
+  Input,
   SchemaComponent,
   useAPIClient,
   useApp,
   useCompile,
   useDocumentTitle,
   usePlugin,
+  useRequest,
   useResourceActionContext,
 } from '@nocobase/client';
 import { str2moment } from '@nocobase/utils/client';
@@ -34,6 +36,7 @@ import { FlowContext, useFlowContext } from './FlowContext';
 import { lang, NAMESPACE } from './locale';
 import useStyles from './style';
 import { getWorkflowDetailPath, getWorkflowExecutionsPath, linkNodes } from './utils';
+import { get } from 'lodash';
 
 function attachJobs(nodes, jobs: any[] = []): void {
   const nodesMap = new Map();
@@ -56,6 +59,23 @@ function attachJobs(nodes, jobs: any[] = []): void {
   });
 }
 
+function JobResult(props) {
+  const { viewJob } = useFlowContext();
+  const { data, loading } = useRequest({
+    resource: 'jobs',
+    action: 'get',
+    params: {
+      filterByTk: viewJob.id,
+    },
+  });
+
+  if (loading) {
+    return <Spin />;
+  }
+  const result = get(data, 'data.result');
+  return <Input.JSON {...props} value={result} disabled />;
+}
+
 function JobModal() {
   const { instructions } = usePlugin(WorkflowPlugin);
   const compile = useCompile();
@@ -68,6 +88,9 @@ function JobModal() {
   return (
     <ActionContextProvider value={{ visible: Boolean(job), setVisible: setViewJob }}>
       <SchemaComponent
+        components={{
+          JobResult,
+        }}
         schema={{
           type: 'void',
           properties: {
@@ -108,7 +131,7 @@ function JobModal() {
                   type: 'object',
                   title: `{{t("Node result", { ns: "${NAMESPACE}" })}}`,
                   'x-decorator': 'FormItem',
-                  'x-component': 'Input.JSON',
+                  'x-component': 'JobResult',
                   'x-component-props': {
                     className: styles.nodeJobResultClass,
                     autoSize: {
@@ -116,8 +139,6 @@ function JobModal() {
                       maxRows: 32,
                     },
                   },
-                  // 'x-read-pretty': true,
-                  'x-disabled': true,
                 },
               },
             },

packages/plugins/@nocobase/plugin-workflow/src/client/ExecutionPage.tsx

@@ -38,6 +38,7 @@ export const ExecutionPage = () => {
                   params: {
                     filter: params,
                     appends: ['jobs', 'workflow', 'workflow.nodes'],
+                    except: ['jobs.result', 'workflow.options'],
                   },
                 },
               },