Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-11 14:17:53 +00:00
commit 62f6d04f3e

View File

@ -16,11 +16,11 @@ import _ from 'lodash';
export const ChartBlockProvider: React.FC = (props) => {
const currentPopupContext = useCurrentPopupContext();
const localVariables = useLocalVariables();
const popUpCtxReady =
_.isEmpty(currentPopupContext) ||
localVariables?.some((variable) => variable.name === '$nPopupRecord' && variable.ctx);
const popupRecordVariable = localVariables?.find((variable) => variable.name === '$nPopupRecord');
const popupCtxReady =
_.isEmpty(currentPopupContext) || !popupRecordVariable?.collectionName || popupRecordVariable?.ctx;
if (!popUpCtxReady) {
if (!popupCtxReady) {
return null;
}