always check node group
This commit is contained in:
1 parent
53c1912fa0
commit
7478e1fa0f
3 files changed
+4
-4
No files matched your search
@@ -765,7 +765,7 @@ const NodeInspector: FC = () => {
|
|||||||
rules={[
|
rules={[
|
||||||
{
|
{
|
||||||
validator() {
|
validator() {
|
||||||
if (def.group && usingGroups && !usingGroups[def.group]) {
|
if (def.group && !usingGroups[def.group]) {
|
||||||
return Promise.reject(new Error(t("node.invalidGroup", { group: def.group })));
|
return Promise.reject(new Error(t("node.invalidGroup", { group: def.group })));
|
||||||
}
|
}
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ G6.registerNode(
|
|||||||
!nodeDefs.has(data.name) ||
|
!nodeDefs.has(data.name) ||
|
||||||
(data.path && !data.children?.length) ||
|
(data.path && !data.children?.length) ||
|
||||||
!checkTreeData(data) ||
|
!checkTreeData(data) ||
|
||||||
(nodeDef.group && usingGroups && !usingGroups[nodeDef.group]) ||
|
(nodeDef.group && !usingGroups[nodeDef.group]) ||
|
||||||
(usingVars && data.input?.some((v) => !usingVars![v])) ||
|
(usingVars && data.input?.some((v) => !usingVars![v])) ||
|
||||||
(usingVars && data.output?.some((v) => !usingVars![v])) ||
|
(usingVars && data.output?.some((v) => !usingVars![v])) ||
|
||||||
(usingVars &&
|
(usingVars &&
|
||||||
|
|||||||
+2
-2
@@ -26,7 +26,7 @@ export class NodeDefs extends Map<string, NodeDef> {
|
|||||||
|
|
||||||
export let nodeDefs: NodeDefs = new NodeDefs();
|
export let nodeDefs: NodeDefs = new NodeDefs();
|
||||||
export let groupDefs: string[] = [];
|
export let groupDefs: string[] = [];
|
||||||
export let usingGroups: Record<string, boolean> | null = null;
|
export let usingGroups: Record<string, boolean> = {};
|
||||||
export let usingVars: Record<string, VarDef> | null = null;
|
export let usingVars: Record<string, VarDef> | null = null;
|
||||||
|
|
||||||
const parsedExprs: Record<string, string[]> = {};
|
const parsedExprs: Record<string, string[]> = {};
|
||||||
@@ -58,7 +58,7 @@ export const initWorkdir = (path: string, handler: typeof alertError) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const updateUsingGroups = (group: string[]) => {
|
export const updateUsingGroups = (group: string[]) => {
|
||||||
usingGroups = null;
|
usingGroups = {};
|
||||||
for (const g of group) {
|
for (const g of group) {
|
||||||
usingGroups ??= {};
|
usingGroups ??= {};
|
||||||
usingGroups[g] = true;
|
usingGroups[g] = true;
|
||||||
|
|||||||
Reference in new issue
Block a user