From 422429e7724fc7ba964332fcffd4966373c2f911 Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Tue, 18 Apr 2023 20:46:59 +0700
Subject: [PATCH] refactor(plugin-workflow): migrate menu items to options
 (#1724)

---
 .../workflow/src/client/WorkflowCanvas.tsx    | 11 +++++++----
 .../client/components/CollectionFieldset.tsx  | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
index e1477538c..fa9ab84af 100644
--- a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
+++ b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
@@ -173,10 +173,13 @@ export function WorkflowCanvas() {
           />
           <Dropdown
             overlay={
-              <Menu onClick={onMenuCommand}>
-                <Menu.Item key="history" disabled={!workflow.allExecuted}>{lang('Execution history')}</Menu.Item>
-                <Menu.Item key="revision" disabled={!revisionable}>{lang('Copy to new version')}</Menu.Item>
-              </Menu>
+              <Menu
+                items={[
+                  { key: 'history', label: lang('Execution history'), disabled: !workflow.allExecuted },
+                  { key: 'revision', label: lang('Copy to new version'), disabled: !revisionable },
+                ]}
+                onClick={onMenuCommand}
+              />
             }
           >
             <Button type="text" icon={<EllipsisOutlined />} />
diff --git a/packages/plugins/workflow/src/client/components/CollectionFieldset.tsx b/packages/plugins/workflow/src/client/components/CollectionFieldset.tsx
index dc0e59d3e..695f4df93 100644
--- a/packages/plugins/workflow/src/client/components/CollectionFieldset.tsx
+++ b/packages/plugins/workflow/src/client/components/CollectionFieldset.tsx
@@ -117,14 +117,17 @@ export default observer(({ value, disabled, onChange }: any) => {
             {unassignedFields.length
               ? (
                 <Dropdown overlay={
-                  <Menu onClick={({ key }) => onChange({ ...value, [key]: null })} className={css`
-                    max-height: 300px;
-                    overflow-y: auto;
-                  `}>
-                    {unassignedFields.map(field => (
-                      <Menu.Item key={field.name}>{compile(field.uiSchema?.title ?? field.name)}</Menu.Item>
-                    ))}
-                  </Menu>
+                  <Menu
+                    items={unassignedFields.map(field => ({
+                      key: field.name,
+                      label: compile(field.uiSchema?.title ?? field.name),
+                    }))}
+                    onClick={({ key }) => onChange({ ...value, [key]: null })}
+                    className={css`
+                      max-height: 300px;
+                      overflow-y: auto;
+                    `}
+                  />
                 }>
                   <Button icon={<PlusOutlined />}>{t('Add field')}</Button>
                 </Dropdown>