fix flow

Author: xlorne

admin-pro-ui/src/components/flow/types.ts

@@ -135,10 +135,6 @@ export interface FlowFormView {
 export interface FlowViewProps {
     // 流程编号
     id?: string;
-    // 是否展示
-    visible: boolean;
-    // 设置展示
-    setVisible:(visible:boolean)=>void;
     // 流程的设计编号
     workCode?: string;
     // 流程的视图数据

admin-pro-ui/src/components/flow/view/FlowModelView.scss

@@ -0,0 +1,25 @@
+.flow-modal.ant-modal {
+  width: 100% !important;
+  top: 0 !important;
+  max-width: 100% !important;
+}
+.flow-modal.ant-modal.ant-modal-content {
+  height: 100vh !important;
+}
+
+.flow-modal {
+  margin: 0 !important;
+  padding: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  overflow-y: hidden;
+
+  .ant-modal-content{
+    width: 100vw !important;
+    height: 100vh !important;
+  }
+
+  .ant-modal-footer{
+    margin: 0 !important;
+  }
+}

admin-pro-ui/src/components/flow/view/FlowModelView.tsx

@@ -0,0 +1,37 @@
+import {FlowViewProps} from "@/components/flow/types";
+import React from "react";
+import {Modal} from "antd";
+import FlowView from "@/components/flow/view/index";
+import "./FlowModelView.scss";
+
+interface FlowModelViewProps extends FlowViewProps{
+    visible:boolean;
+    setVisible:(visible:boolean)=>void;
+}
+
+ const FlowModelView:React.FC<FlowModelViewProps> = (props)=>{
+    return (
+        <Modal
+            className={"flow-modal"}
+            open={props.visible}
+            onCancel={()=>{
+                props.setVisible(false);
+            }}
+            onOk={()=>{
+                props.setVisible(false);
+            }}
+            onClose={()=>{
+                props.setVisible(false);
+            }}
+            destroyOnClose={true}
+            footer={false}
+            closable={false}
+        >
+            <FlowView
+                {...props}
+            />
+        </Modal>
+    )
+}
+
+export default FlowModelView;

admin-pro-ui/src/components/flow/view/index.tsx

@@ -9,3 +9,4 @@ const FlowView:React.FC<FlowViewProps> = (props)=>{
 }
 
 export default FlowView;
+

admin-pro-ui/src/pages/flow/leave/index.tsx

@@ -2,8 +2,8 @@ import React from "react";
 import {ActionType, PageContainer, ProTable} from "@ant-design/pro-components";
 import {list} from "@/api/leave";
 import {Button} from "antd";
-import FlowView from "@/components/flow/view";
 import LeaveForm from "@/pages/flow/leave/LeaveForm";
+import FlowModelView from "@/components/flow/view/FlowModelView";
 
 const LeavePage = () => {
 
@@ -53,7 +53,7 @@ const LeavePage = () => {
                 }}
             />
 
-            <FlowView
+            <FlowModelView
                 visible={visible}
                 setVisible={setVisible}
                 view={LeaveForm}

admin-pro-ui/src/pages/flow/record/index.tsx

@@ -12,8 +12,8 @@ import {
 import moment from "moment";
 import {message, Tabs} from "antd";
 import "./index.scss";
-import FlowView from "@/components/flow/view";
 import LeaveForm from "@/pages/flow/leave/LeaveForm";
+import FlowModelView from "@/components/flow/view/FlowModelView";
 
 const FlowRecordPage = () => {
 
@@ -31,7 +31,7 @@ const FlowRecordPage = () => {
     const allTodoActionRef = React.useRef<ActionType>();
 
 
-    const handlerUrgeFlow = (recordId:any) => {
+    const handlerUrgeFlow = (recordId: any) => {
         const body = {
             recordId,
         }
@@ -61,9 +61,9 @@ const FlowRecordPage = () => {
         {
             title: '标题',
             dataIndex: 'title',
-            render:(value:any,record:any)=>{
+            render: (value: any, record: any) => {
                 return (
-                    <div dangerouslySetInnerHTML={{ __html: value }}></div>
+                    <div dangerouslySetInnerHTML={{__html: value}}></div>
                 );
             }
         },
@@ -171,7 +171,7 @@ const FlowRecordPage = () => {
     ] as any[];
 
 
-    const reloadTable = ()=>{
+    const reloadTable = () => {
         if (key === 'todo') {
             todoActionRef.current?.reload();
         }
@@ -213,7 +213,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findTodoByOperatorId(params, sort, filter, []);
@@ -230,7 +230,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findDoneByOperatorId(params, sort, filter, []);
@@ -247,7 +247,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findInitiatedByOperatorId(params, sort, filter, []);
@@ -264,7 +264,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findTimeoutTodoByOperatorId(params, sort, filter, []);
@@ -282,7 +282,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findPostponedTodoByOperatorId(params, sort, filter, []);
@@ -299,7 +299,7 @@ const FlowRecordPage = () => {
                                 search={false}
                                 columns={columns}
                                 rowClassName={(record) => {
-                                    return record.read?"record-read":"record-unread";
+                                    return record.read ? "record-read" : "record-unread";
                                 }}
                                 request={async (params, sort, filter) => {
                                     return findAllByOperatorId(params, sort, filter, []);
@@ -310,16 +310,16 @@ const FlowRecordPage = () => {
                 ]}
             />
 
-            <FlowView
-                id={currentId}
+
+            <FlowModelView
                 visible={flowViewVisible}
                 setVisible={setFlowViewVisible}
+                id={currentId}
                 view={{
                     'default': LeaveForm
                 }}
             />
 
-
         </PageContainer>
     )
 }