diff --git a/packages/editor/src/api/ai.ts b/packages/editor/src/api/ai.ts index f7a91f3..186fac7 100644 --- a/packages/editor/src/api/ai.ts +++ b/packages/editor/src/api/ai.ts @@ -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 }); }; diff --git a/packages/editor/src/components/EventConfig/ActionModal/OpenDrawerAction.tsx b/packages/editor/src/components/EventConfig/ActionModal/OpenDrawerAction.tsx index b3fb753..b4c2a60 100644 --- a/packages/editor/src/components/EventConfig/ActionModal/OpenDrawerAction.tsx +++ b/packages/editor/src/components/EventConfig/ActionModal/OpenDrawerAction.tsx @@ -14,7 +14,6 @@ const OpenDrawerAction = () => { }); } }); - console.log(drawers); return { drawers, }; diff --git a/packages/editor/src/components/FlowNode/FlowNode.tsx b/packages/editor/src/components/FlowNode/FlowNode.tsx index b27f793..b2bf6ed 100644 --- a/packages/editor/src/components/FlowNode/FlowNode.tsx +++ b/packages/editor/src/components/FlowNode/FlowNode.tsx @@ -280,9 +280,6 @@ function FlowNode(_: any, ref: any) { <> { - console.log('pinch', event); - }} displayHorizontalScroll={false} useMouseDrag={true} useWheelScroll={true} diff --git a/packages/editor/src/packages/Functional/Drawer/Drawer.tsx b/packages/editor/src/packages/Functional/Drawer/Drawer.tsx index 44e1ee7..93b9890 100644 --- a/packages/editor/src/packages/Functional/Drawer/Drawer.tsx +++ b/packages/editor/src/packages/Functional/Drawer/Drawer.tsx @@ -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); @@ -78,26 +85,25 @@ const AntDrawer = forwardRef(({ id, type, config, elements, onClose, onAfterOpen handleOpenChange(open)} onClose={handleClose} - data-id={id} - footer={config.props.footer ? undefined : null} style={{ ...config.style }} zIndex={998} extra={ -
+
{bulkActionList.map((item: any, index: number) => { return ( diff --git a/packages/editor/src/packages/Scene/MarsTable/MarsTable.tsx b/packages/editor/src/packages/Scene/MarsTable/MarsTable.tsx index 6d9467d..d540a34 100644 --- a/packages/editor/src/packages/Scene/MarsTable/MarsTable.tsx +++ b/packages/editor/src/packages/Scene/MarsTable/MarsTable.tsx @@ -414,11 +414,11 @@ const MarsTable = ({ id, type, config, elements, onCheckedChange }: ComponentTyp {bulkActionList?.map((item) => { return ( diff --git a/packages/editor/src/packages/utils/action.ts b/packages/editor/src/packages/utils/action.ts index a9b3daa..d264883 100644 --- a/packages/editor/src/packages/utils/action.ts +++ b/packages/editor/src/packages/utils/action.ts @@ -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') { @@ -280,15 +276,6 @@ async function handleOpenModal({ action, next }: ActionNode, data execAction(next, data); } -/** - * 打开/关闭抽屉 - */ -async function handleOpenDrawer({ action, next }: ActionNode, 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); -} /** * 处理确认框 */ diff --git a/packages/materials/Functional/Drawer/Drawer.tsx b/packages/materials/Functional/Drawer/Drawer.tsx index ec4a64d..51b4006 100644 --- a/packages/materials/Functional/Drawer/Drawer.tsx +++ b/packages/materials/Functional/Drawer/Drawer.tsx @@ -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: () => { @@ -51,23 +58,20 @@ const AntDrawer = forwardRef(({ config, elements, onClose, onAfterOpenChange }: handleOpenChange(open)} onClose={handleClose} footer={config.props.footer ? undefined : null} style={{ ...config.style }} - zIndex={998} extra={ -
+
{bulkActionList.map((item: any, index: number) => { return ( handleOperate(item.eventName)} - key={item.eventName} - style={{ marginRight: 8 }} authCode={item.authCode} authScript={item.authScript} > diff --git a/packages/materials/utils/action.ts b/packages/materials/utils/action.ts index 87ca9f4..af36b02 100644 --- a/packages/materials/utils/action.ts +++ b/packages/materials/utils/action.ts @@ -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') { @@ -280,16 +276,6 @@ async function handleOpenModal({ action, next }: ActionNode, data execAction(next, data); } -/** - * 打开/关闭抽屉 - */ -async function handleOpenDrawer({ action, next }: ActionNode, 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); -} - /** * 处理确认框 */