浏览代码

feat: Build the positions of the Switch handle #1739 (#2018)

### What problem does this PR solve?

feat: Build the positions of the Switch handle #1739

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
tags/v0.10.0
balibabu 1年前
父节点
当前提交
02985fc905
没有帐户链接到提交者的电子邮件

+ 49
- 29
web/src/pages/flow/canvas/node/hooks.ts 查看文件

import get from 'lodash/get'; import get from 'lodash/get';
import intersectionWith from 'lodash/intersectionWith';
import isEqual from 'lodash/isEqual';
import pick from 'lodash/pick'; import pick from 'lodash/pick';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { useUpdateNodeInternals } from 'reactflow'; import { useUpdateNodeInternals } from 'reactflow';
import { Operator } from '../../constant';
import { IPosition, NodeData } from '../../interface'; import { IPosition, NodeData } from '../../interface';
import { buildNewPositionMap } from '../../utils';
import { buildNewPositionMap, isKeysEqual } from '../../utils';


export const useBuildCategorizeHandlePositions = ({ export const useBuildCategorizeHandlePositions = ({
data, data,
id: string; id: string;
data: NodeData; data: NodeData;
}) => { }) => {
const operatorName = data.label as Operator;
const updateNodeInternals = useUpdateNodeInternals(); const updateNodeInternals = useUpdateNodeInternals();
const [positionMap, setPositionMap] = useState<Record<string, IPosition>>({}); const [positionMap, setPositionMap] = useState<Record<string, IPosition>>({});
const categoryData = useMemo(
() => get(data, 'form.category_description') ?? {},
[data],
);

const categoryData = useMemo(() => {
if (operatorName === Operator.Categorize) {
return get(data, `form.category_description`, {});
} else if (operatorName === Operator.Switch) {
return get(data, 'form.conditions', []);
}
return {};
}, [data, operatorName]);


const positions = useMemo(() => { const positions = useMemo(() => {
return Object.keys(categoryData) return Object.keys(categoryData)
.map((x) => {
.map((x, idx) => {
const position = positionMap[x]; const position = positionMap[x];
return { text: x, ...position };
let text = x;
if (operatorName === Operator.Switch) {
text = `Item ${idx + 1}`;
}
return { text, ...position };
}) })
.filter((x) => typeof x?.right === 'number'); .filter((x) => typeof x?.right === 'number');
}, [categoryData, positionMap]);
}, [categoryData, positionMap, operatorName]);


useEffect(() => { useEffect(() => {
// Cache used coordinates // Cache used coordinates
setPositionMap((state) => { setPositionMap((state) => {
// index in use
const indexesInUse = Object.values(state).map((x) => x.idx);
const categoryDataKeys = Object.keys(categoryData); const categoryDataKeys = Object.keys(categoryData);
const stateKeys = Object.keys(state); const stateKeys = Object.keys(state);
if (!isEqual(categoryDataKeys.sort(), stateKeys.sort())) {
const intersectionKeys = intersectionWith(
stateKeys,
if (!isKeysEqual(categoryDataKeys, stateKeys)) {
const { newPositionMap, intersectionKeys } = buildNewPositionMap(
categoryDataKeys, categoryDataKeys,
(categoryDataKey, postionMapKey) => categoryDataKey === postionMapKey,
);
const newPositionMap = buildNewPositionMap(
categoryDataKeys.filter(
(x) => !intersectionKeys.some((y) => y === x),
),
indexesInUse,
state,
); );


const nextPositionMap = { const nextPositionMap = {
return { positions }; return { positions };
}; };


export const useBuildSwitchHandlePositions = ({
data,
id,
}: {
id: string;
data: NodeData;
}) => {};
// export const useBuildSwitchHandlePositions = ({
// data,
// id,
// }: {
// id: string;
// data: NodeData;
// }) => {
// const [positionMap, setPositionMap] = useState<Record<string, IPosition>>({});
// const conditions = useMemo(() => get(data, 'form.conditions', []), [data]);
// const updateNodeInternals = useUpdateNodeInternals();

// const positions = useMemo(() => {
// return conditions
// .map((x, idx) => {
// const text = `Item ${idx}`;
// const position = positionMap[text];
// return { text: text, ...position };
// })
// .filter((x) => typeof x?.right === 'number');
// }, [conditions, positionMap]);

// useEffect(() => {
// updateNodeInternals(id);
// }, [id, updateNodeInternals, positionMap]);

// return { positions };
// };

+ 14
- 2
web/src/pages/flow/constant.tsx 查看文件

[Operator.Switch]: SwitchIcon, [Operator.Switch]: SwitchIcon,
}; };


export const operatorMap = {
export const operatorMap: Record<
Operator,
{
backgroundColor?: string;
color?: string;
width?: number;
height?: number;
fontSize?: number;
iconFontSize?: number;
iconWidth?: number;
moreIconColor?: number;
}
> = {
[Operator.Retrieval]: { [Operator.Retrieval]: {
backgroundColor: '#cad6e0', backgroundColor: '#cad6e0',
color: '#385974', color: '#385974',
top_n: 30, top_n: 30,
}; };


export const initialSwitchValues = { conditions: [{}] };
export const initialSwitchValues = { conditions: [] };


export const CategorizeAnchorPointPositions = [ export const CategorizeAnchorPointPositions = [
{ top: 1, right: 34 }, { top: 1, right: 34 },

+ 24
- 1
web/src/pages/flow/interface.ts 查看文件

no: string; no: string;
} }


interface Condition {
items: Item[];
logical_operator: string;
to: string;
}

interface Item {
cpn_id: string;
operator: string;
value: string;
}

export interface ISwitchForm {
conditions: Condition[];
end_cpn_id: string;
no: string;
}

export type NodeData = { export type NodeData = {
label: string; // operator type label: string; // operator type
name: string; // operator name name: string; // operator name
color: string; color: string;
form: IBeginForm | IRetrievalForm | IGenerateForm | ICategorizeForm;
form:
| IBeginForm
| IRetrievalForm
| IGenerateForm
| ICategorizeForm
| ISwitchForm;
}; };


export type IPosition = { top: number; right: number; idx: number }; export type IPosition = { top: number; right: number; idx: number };

+ 8
- 0
web/src/pages/flow/store.ts 查看文件

'to', 'to',
]); ]);
break; break;
// case Operator.Switch:
// if (sourceHandle)
// updateNodeForm(source, target, [
// 'conditions',
// sourceHandle,
// 'to',
// ]);
// break;
default: default:
break; break;
} }

+ 24
- 4
web/src/pages/flow/utils.ts 查看文件

import { DSLComponents } from '@/interfaces/database/flow'; import { DSLComponents } from '@/interfaces/database/flow';
import { removeUselessFieldsFromValues } from '@/utils/form'; import { removeUselessFieldsFromValues } from '@/utils/form';
import { humanId } from 'human-id'; import { humanId } from 'human-id';
import { curry, sample } from 'lodash';
import { curry, intersectionWith, isEqual, sample } from 'lodash';
import pipe from 'lodash/fp/pipe'; import pipe from 'lodash/fp/pipe';
import isObject from 'lodash/isObject'; import isObject from 'lodash/isObject';
import { Edge, Node, Position } from 'reactflow'; import { Edge, Node, Position } from 'reactflow';
previous.sourceHandle === current.sourceHandle; previous.sourceHandle === current.sourceHandle;


export const buildNewPositionMap = ( export const buildNewPositionMap = (
categoryDataKeys: string[],
indexesInUse: number[],
currentKeys: string[],
previousPositionMap: Record<string, IPosition>,
) => { ) => {
return categoryDataKeys.reduce<Record<string, IPosition>>((pre, cur) => {
// index in use
const indexesInUse = Object.values(previousPositionMap).map((x) => x.idx);
const previousKeys = Object.keys(previousPositionMap);
const intersectionKeys = intersectionWith(
previousKeys,
currentKeys,
(categoryDataKey, positionMapKey) => categoryDataKey === positionMapKey,
);
// difference set
const currentDifferenceKeys = currentKeys.filter(
(x) => !intersectionKeys.some((y) => y === x),
);
const newPositionMap = currentDifferenceKeys.reduce<
Record<string, IPosition>
>((pre, cur) => {
// take a coordinate // take a coordinate
const effectiveIdxes = CategorizeAnchorPointPositions.map( const effectiveIdxes = CategorizeAnchorPointPositions.map(
(x, idx) => idx, (x, idx) => idx,


return pre; return pre;
}, {}); }, {});

return { intersectionKeys, newPositionMap };
};

export const isKeysEqual = (currentKeys: string[], previousKeys: string[]) => {
return isEqual(currentKeys.sort(), previousKeys.sort());
}; };

正在加载...
取消
保存