mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-09 23:49:27 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
62f6d04f3e
@ -16,11 +16,11 @@ import _ from 'lodash';
|
|||||||
export const ChartBlockProvider: React.FC = (props) => {
|
export const ChartBlockProvider: React.FC = (props) => {
|
||||||
const currentPopupContext = useCurrentPopupContext();
|
const currentPopupContext = useCurrentPopupContext();
|
||||||
const localVariables = useLocalVariables();
|
const localVariables = useLocalVariables();
|
||||||
const popUpCtxReady =
|
const popupRecordVariable = localVariables?.find((variable) => variable.name === '$nPopupRecord');
|
||||||
_.isEmpty(currentPopupContext) ||
|
const popupCtxReady =
|
||||||
localVariables?.some((variable) => variable.name === '$nPopupRecord' && variable.ctx);
|
_.isEmpty(currentPopupContext) || !popupRecordVariable?.collectionName || popupRecordVariable?.ctx;
|
||||||
|
|
||||||
if (!popUpCtxReady) {
|
if (!popupCtxReady) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user