From df3f6017f2e0f446dc2219a8a21aa835cec5a644 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Tue, 17 Dec 2024 16:59:41 +0800
Subject: [PATCH] 1

---
 .../src/pages/Workflow/Definition/index.tsx   | 23 ++++++++++---------
 .../src/pages/Workflow/Instance/index.tsx     |  5 +++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/Workflow/Definition/index.tsx b/frontend/src/pages/Workflow/Definition/index.tsx
index 855ee205..a14f54c6 100644
--- a/frontend/src/pages/Workflow/Definition/index.tsx
+++ b/frontend/src/pages/Workflow/Definition/index.tsx
@@ -183,6 +183,8 @@ const WorkflowDefinitionList: React.FC = () => {
         {
             title: '操作',
             key: 'action',
+            fixed: 'right',
+            width: 200,
             render: (_: any, record: WorkflowDefinition) => (
                 <Space size="middle">
                     {record.status === 'DRAFT' && (
@@ -212,21 +214,20 @@ const WorkflowDefinitionList: React.FC = () => {
             }
         >
             <Table
-                loading={loading}
-                dataSource={pageData?.content}
                 columns={columns}
+                dataSource={pageData?.content}
+                loading={loading}
                 rowKey="id"
+                scroll={{ x: 1300 }}
                 pagination={{
-                    total: pageData?.totalElements,
+                    current: (query.pageNum || 0) + 1,
                     pageSize: query.pageSize,
-                    current: query.pageNum + 1,
-                    onChange: (page, pageSize) => {
-                        setQuery({
-                            ...query,
-                            pageNum: page - 1,
-                            pageSize
-                        });
-                    }
+                    total: pageData?.totalElements || 0,
+                    onChange: (page, pageSize) => setQuery({
+                        ...query,
+                        pageNum: page - 1,
+                        pageSize
+                    }),
                 }}
             />
             <EditModal
diff --git a/frontend/src/pages/Workflow/Instance/index.tsx b/frontend/src/pages/Workflow/Instance/index.tsx
index 0c7de557..28b178dd 100644
--- a/frontend/src/pages/Workflow/Instance/index.tsx
+++ b/frontend/src/pages/Workflow/Instance/index.tsx
@@ -61,7 +61,7 @@ const WorkflowInstanceList: React.FC = () => {
             render: (status: string) => {
                 if (!status) return '暂无';
                 const statusMap: Record<string, { color: string; text: string }> = {
-                    TERMINATED: { color: 'red', text: '已终止' },
+                    TERMINATED: { color: 'red', text: '终止' },
                     COMPLETED: { color: 'green', text: '已完成' },
                     RUNNING: { color: 'blue', text: '运行中' },
                 };
@@ -72,6 +72,8 @@ const WorkflowInstanceList: React.FC = () => {
         {
             title: '操作',
             key: 'action',
+            fixed: 'right',
+            width: 120,
             render: (_, record) => (
                 <Space size="middle">
                     <a onClick={() => handleViewDetail(record)}>查看详情</a>
@@ -98,6 +100,7 @@ const WorkflowInstanceList: React.FC = () => {
                 dataSource={data}
                 loading={loading}
                 rowKey="id"
+                scroll={{ x: 1200 }}
                 locale={{
                     emptyText: <Empty description="暂无数据" />
                 }}