Kaynağa Gözat

所有操作列都固定右侧修复界面显示问题

pm 2 ay önce
ebeveyn
işleme
2274f6e976

+ 2 - 0
src/components/IsolationWork.tsx

@@ -2992,6 +2992,7 @@ export default function IsolationWork({ subMenu }: IsolationWorkProps) {
       title: t('table.operation'),
       width: '15%',
       align: 'center',
+      fixed: 'right',
       render: (_: any, record: TableRow) => (
         <div className="flex items-center justify-center gap-2">
           <UIButton
@@ -3164,6 +3165,7 @@ export default function IsolationWork({ subMenu }: IsolationWorkProps) {
       title: t('table.operation'),
       width: '20%',
       align: 'center',
+      fixed: 'right',
       render: (_: any, record: WorkflowDesignVO) => (
         <div className="flex items-center justify-center gap-2">
           <UIButton

+ 2 - 2
src/components/MyTask.tsx

@@ -1609,12 +1609,12 @@ export default function MyTask() {
         color: '#ffffff',
       };
     }
-    // 已完成:深绿色 #15803d
+    // 已完成:浅绿色 #0acb57
     if (statusTextLower.includes('已完成') || statusTextLower.includes('已通过') || 
         statusTextLower.includes('approved') || statusTextLower.includes('完成') ||
         statusTextLower.includes('执行完成')) {
       return {
-        backgroundColor: '#15803d',
+        backgroundColor: '#0acb57',
         color: '#ffffff',
       };
     }

+ 2 - 2
src/components/TaskManagement.tsx

@@ -2031,8 +2031,8 @@ export default function TaskManagement() {
           </div>
         </div>
 
-        {/* 表格容器 */}
-        <div className="overflow-x-auto min-w-0">
+        {/* 表格容器:不设 overflow,避免出现第二层纵向滚动条,仅用 Table 的 scroll.x 做横向滚动 */}
+        <div className="min-w-0">
           <AntdTable
             loading={loading}
             columns={columns}

+ 4 - 3
src/components/UserManagement.tsx

@@ -289,7 +289,7 @@ export default function UserManagement({ subMenu }: UserManagementProps) {
     {
       title: t('table.username'),
       dataIndex: 'username',
-      width: '10%',
+      width: '8%',
     },
     {
       title: t('table.nickname'),
@@ -388,7 +388,8 @@ export default function UserManagement({ subMenu }: UserManagementProps) {
     },
     {
       title: t('table.operation'),
-      width: '10%',
+      width: '12%',
+      fixed: 'right',
       align: 'center',
       render: (_: any, record: UserVO) => {
         const menuItems = [
@@ -426,7 +427,7 @@ export default function UserManagement({ subMenu }: UserManagementProps) {
         });
 
         return (
-          <div className="flex items-center gap-2 justify-center">
+          <div className="flex items-center gap-2 justify-center" style={{ whiteSpace: 'nowrap' }}>
             <PermissionWrapper permission="system:user:update">
               <UIButton
                 variant="ghost"

+ 8 - 7
src/components/WorkJobDetail.tsx

@@ -2717,15 +2717,16 @@ export default function WorkJobDetail() {
         </div>
 
         {/* 任务详情和执行记录区域 - 左右两栏布局 */}
-        <div className="flex-1 flex gap-8 mb-6 min-h-0">
-          {/* 左侧:作业流程 */}
+        <div className="flex-1 flex gap-8 mb-6 min-h-0 overflow-hidden">
+          {/* 左侧:作业流程 - 最大 1400px,随屏幕缩小可收缩 */}
           <div 
             className="bg-white rounded-xl shadow-sm border border-gray-200 flex flex-col min-h-0" 
             style={{ 
               marginLeft: '20px', 
               maxHeight: '790px', 
-              width: '1400px', 
-              flexShrink: 0 
+              maxWidth: '1400px',
+              flex: '0 1 1400px',
+              minWidth: 0
             }}
           >
             <div className="px-6 py-4 border-b border-gray-200">
@@ -2795,10 +2796,10 @@ export default function WorkJobDetail() {
             </div>
           </div>
 
-          {/* 右侧:作业信息 + 当前任务 */}
+          {/* 右侧:作业信息 + 当前任务 - 固定最小宽度,小屏时仍能完整看到 */}
           <div 
-            className="flex-1 flex gap-4 min-h-0 flex-shrink-0 overflow-hidden" 
-            style={{ marginRight: '20px', maxHeight: '790px', flexDirection: 'column' }}
+            className="flex-1 flex gap-4 min-h-0 overflow-hidden" 
+            style={{ marginRight: '20px', maxHeight: '790px', flexDirection: 'column', minWidth: 380 }}
           >
             {/* 作业信息 + 当前任务 组合区域 */}
             <div