fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 23:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: variable parsing incompatibility with {{title}} data in secondary confirm (#6838)

Browse Source 
* fix: variable parsing incompatibility with {{title}} data in secondary confirmation

* fix: bug
This commit is contained in:
Katherine 2025-05-08 20:41:14 +08:00 committed by GitHub
parent 18f7dc6d17
commit 25bfdd61d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
View File

@ -739,9 +739,11 @@ export function SecondConFirm() {
title={t('Secondary confirmation')}
initialValues={{
title:
t(fieldSchema?.['x-component-props']?.confirm?.title, { title: compile(fieldSchema.title) }) ||
compile(fieldSchema?.['x-component-props']?.confirm?.title) ||
t('Perform the {{title}}', { title: compile(fieldSchema.title) }),
content:
t(fieldSchema?.['x-component-props']?.confirm?.content, { title: compile(fieldSchema.title) }) ||
compile(fieldSchema?.['x-component-props']?.confirm?.content) ||
t('Are you sure you want to perform the {{title}} action?', { title: compile(fieldSchema.title) }),
}}

6
packages/core/client/src/schema-component/antd/action/Action.tsx
View File

@ -454,6 +454,7 @@ const RenderButton = ({
const variables = useVariables();
const localVariables = useLocalVariables();
const openPopupRef = useRef(null);
const compile = useCompile();
openPopupRef.current = openPopup;
const scopes = {
variables,
@ -467,8 +468,9 @@ const RenderButton = ({
}
e.preventDefault();
e.stopPropagation();
const resultTitle = await getVariableValue(confirm?.title, scopes);
const resultContent = await getVariableValue(confirm?.content, scopes);
const resultTitle = await getVariableValue(t(confirm?.title, { title: compile(fieldSchema.title) }), scopes);
const resultContent = await getVariableValue(t(confirm?.content, { title: compile(fieldSchema.title) }), scopes);
if (!disabled && aclCtx) {
const onOk = () => {
if (onClick) {