Skip to content

Commit

Permalink
chore: review代码
Browse files Browse the repository at this point in the history
  • Loading branch information
@JackySoft
JackySoft committed Aug 28, 2024
1 parent fa20d20 commit dfa385f
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 55 deletions.
1 change: 0 additions & 1 deletion packages/editor/src/api/ai.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ import { message } from 'antd';

// 通过message获取代码
export const generateCode = (params: AIChat.AILibChatProps) => {
console.log('message', params.message);
return request.post('/ai/lib/chat', params, { showLoading: false, timeout: 50000 });
};
1 change: 0 additions & 1 deletion packages/editor/src/components/EventConfig/ActionModal/OpenDrawerAction.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const OpenDrawerAction = () => {
});
}
});
console.log(drawers);
return {
drawers,
};
Expand Down
3 changes: 0 additions & 3 deletions packages/editor/src/components/FlowNode/FlowNode.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ function FlowNode(_: any, ref: any) {
<>
<InfiniteViewer
className="node-viewer"
onPinch={(event) => {
console.log('pinch', event);
}}
displayHorizontalScroll={false}
useMouseDrag={true}
useWheelScroll={true}
Expand Down
24 changes: 15 additions & 9 deletions packages/editor/src/packages/Functional/Drawer/Drawer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,19 @@ const AntDrawer = forwardRef(({ id, type, config, elements, onClose, onAfterOpen

useImperativeHandle(ref, () => {
return {
show() {
setVisible(true);
},
hide() {
// 关闭弹框
close: () => {
setVisible(false);
},
// 打开弹框
open: () => {
return new Promise((resolve) => {
setVisible(() => {
resolve(true);
return true;
});
});
},
// 显示确认Loading
showLoading: () => {
setLoading(true);
Expand Down Expand Up @@ -78,26 +85,25 @@ const AntDrawer = forwardRef(({ id, type, config, elements, onClose, onAfterOpen
</div>
<Drawer
{...config.props}
data-id={id}
data-type={type}
open={visible}
footer={config.props.footer ? undefined : null}
getContainer={false}
afterOpenChange={(open) => handleOpenChange(open)}
onClose={handleClose}
data-id={id}
footer={config.props.footer ? undefined : null}
style={{ ...config.style }}
zIndex={998}
extra={
<div>
<div style={{ display: 'flex', gap: 10 }}>
{bulkActionList.map((item: any, index: number) => {
return (
<Button
key={item.eventName}
type={item.type}
danger={item.danger}
icon={item.icon ? React.createElement(iconsList[item.icon]) : null}
onClick={() => handleOperate(item.eventName)}
key={item.eventName}
style={{ marginRight: 8 }}
>
{item.text}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/packages/Scene/MarsTable/MarsTable.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,11 @@ const MarsTable = ({ id, type, config, elements, onCheckedChange }: ComponentTyp
{bulkActionList?.map((item) => {
return (
<Button
key={item.eventName}
type={item.type}
danger={item.danger}
icon={item.icon ? React.createElement(iconsList[item.icon]) : null}
onClick={() => handleOperate(item.eventName)}
key={item.eventName}
>
{item.text}
</Button>
Expand Down
17 changes: 2 additions & 15 deletions packages/editor/src/packages/utils/action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,10 @@ const execAction = (node: any, params: any = {}) => {
handleNotifacation(node, data);
} else if (node.action.actionType === 'request' || node.action.actionType === 'download') {
handleRequest(node, data);
} else if (node.action.actionType === 'openModal') {
} else if (node.action.actionType === 'openModal' || node.action.actionType === 'openDrawer') {
handleOpenModal(node, data, 'open');
} else if (node.action.actionType === 'closeModal') {
} else if (node.action.actionType === 'closeModal' || node.action.actionType === 'closeDrawer') {
handleOpenModal(node, data, 'close');
} else if (node.action.actionType === 'openDrawer') {
handleOpenDrawer(node, data, 'open');
} else if (node.action.actionType === 'closeDrawer') {
handleOpenDrawer(node, data, 'close');
} else if (node.action.actionType === 'jumpLink') {
handleJumpLink(node, data);
} else if (node.action.actionType === 'reloadPage') {
Expand Down Expand Up @@ -280,15 +276,6 @@ async function handleOpenModal({ action, next }: ActionNode<MethodsAction>, data
execAction(next, data);
}

/**
* 打开/关闭抽屉
*/
async function handleOpenDrawer({ action, next }: ActionNode<MethodsAction>, data: any = {}, type: 'open' | 'close') {
const ref = getComponentRef(action.target);
if (type === 'close') ref.hide({ ...data });
if (type === 'open') await ref.show({ ...data });
execAction(next, data);
}
/**
* 处理确认框
*/
Expand Down
22 changes: 13 additions & 9 deletions packages/materials/Functional/Drawer/Drawer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,18 @@ const AntDrawer = forwardRef(({ config, elements, onClose, onAfterOpenChange }:

useImperativeHandle(ref, () => {
return {
show() {
setVisible(true);
// 关闭弹框
close: () => {
setVisible(() => false);
},
hide() {
setVisible(false);
// 打开弹框
open: () => {
return new Promise((resolve) => {
setVisible(() => {
resolve(true);
return true;
});
});
},
// 显示确认Loading
showLoading: () => {
Expand Down Expand Up @@ -51,23 +58,20 @@ const AntDrawer = forwardRef(({ config, elements, onClose, onAfterOpenChange }:
<Drawer
{...config.props}
open={visible}
getContainer={false}
afterOpenChange={(open) => handleOpenChange(open)}
onClose={handleClose}
footer={config.props.footer ? undefined : null}
style={{ ...config.style }}
zIndex={998}
extra={
<div>
<div style={{ display: 'flex', gap: 10 }}>
{bulkActionList.map((item: any, index: number) => {
return (
<AuthButton
key={item.eventName}
type={item.type}
danger={item.danger}
icon={item.icon ? React.createElement(iconsList[item.icon]) : null}
onClick={() => handleOperate(item.eventName)}
key={item.eventName}
style={{ marginRight: 8 }}
authCode={item.authCode}
authScript={item.authScript}
>
Expand Down
18 changes: 2 additions & 16 deletions packages/materials/utils/action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,10 @@ const execAction = (node: any, params: any = {}) => {
handleNotifacation(node, data);
} else if (node.action.actionType === 'request' || node.action.actionType === 'download') {
handleRequest(node, data);
} else if (node.action.actionType === 'openModal') {
} else if (['openModal', 'openDrawer'].includes(node.action.actionType)) {
handleOpenModal(node, data, 'open');
} else if (node.action.actionType === 'closeModal') {
} else if (['closeModal', 'closeDrawer'].includes(node.action.actionType)) {
handleOpenModal(node, data, 'close');
} else if (node.action.actionType === 'openDrawer') {
handleOpenDrawer(node, data, 'open');
} else if (node.action.actionType === 'closeDrawer') {
handleOpenDrawer(node, data, 'close');
} else if (node.action.actionType === 'jumpLink') {
handleJumpLink(node, data);
} else if (node.action.actionType === 'reloadPage') {
Expand Down Expand Up @@ -280,16 +276,6 @@ async function handleOpenModal({ action, next }: ActionNode<MethodsAction>, data
execAction(next, data);
}

/**
* 打开/关闭抽屉
*/
async function handleOpenDrawer({ action, next }: ActionNode<MethodsAction>, data: any = {}, type: 'open' | 'close') {
const ref = getComponentRef(action.target);
if (type === 'close') ref.hide({ ...data });
if (type === 'open') await ref.show({ ...data });
execAction(next, data);
}

/**
* 处理确认框
*/
Expand Down

0 comments on commit dfa385f

Please sign in to comment.