diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx index 621662f711..af6ee1b8d6 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockProvider.tsx @@ -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; }